MDL27522 First version Push

modified: mod/scorm/report.php new file: mod/scorm/reportuser.php MDL-27522 SCORM Reports-remove users report to seperate files for better re-use modified: mod/scorm/reportuser.php MDL-27522 SCORM Reports validated reportuser.php modified: mod/scorm/report.php modified: mod/scorm/reportuser.php MDL-27522 SCORM REPORT - updating reportuser.php to use MUST_EXIST parameter modified: mod/scorm/lang/en/scorm.php modified: mod/scorm/reportuser.php MDL-27522 SCORM Reports- Cleaning of codes modified: mod/scorm/report.php modified: mod/scorm/reportuser.php MDL-27522 SCORM Reports- update formating modified: mod/scorm/report.php modified: mod/scorm/reportuser.php MDL-27522 SCORM Reports removed unwanted codes from reportuser.php modified: mod/scorm/reportuser.php MDL-27522 Scorm Reports - optimising codes modified: mod/scorm/report.php modified: mod/scorm/reportuser.php MDL-27522 Scorm Reports-Formating report.php modified: mod/scorm/report.php MDL-27522 Scorm Reporting - removing unsed variables modified: mod/scorm/lang/en/scorm.php modified: mod/scorm/report.php modified: mod/scorm/reportuser.php MDL-27522 SCORM Reporting - Renaming reportuser.php to userreport.php new file: mod/scorm/userreport.php MDL-27522 SCORM Reporting - deleting old reportuser.php deleted: mod/scorm/reportuser.php MDL-27522 Scorm Reporting - updated version number MDL-27522 Scorm Reporting - Discarding version changes MDL-27523 Scorm Reporting - Basic reporting plugin new file: mod/scorm/report/basic/lang/en/scorm_basic.php new file: mod/scorm/report/basic/report.php new file: mod/scorm/report/default.php new file: mod/scorm/report/reportlib.php MDL-27523 Scorm Reporting - Database Table structure pushed new file: mod/scorm/db/subplugins.php MDL-27523 Scorm Reporting - Plugin container codes modified: mod/scorm/report.php modified: mod/scorm/tabs.php MDL-27523 Scorm Reporting - Capability update modified: mod/scorm/report/reportlib.php MDL-27523 Scorm Reporting - commenting files modified: mod/scorm/report/basic/db/install.php modified: mod/scorm/report/basic/lang/en/scorm_basic.php modified: mod/scorm/report/basic/version.php MDL-27523 Scorm Reporting - Formating codes modified: mod/scorm/report/basic/db/install.php modified: mod/scorm/report/basic/report.php modified: mod/scorm/report/basic/version.php modified: mod/scorm/report/default.php modified: mod/scorm/report/reportlib.php MDL-27523 Scorm Reporting - fixing small bugs modified: mod/scorm/report/basic/report.php MDL-27523 Scorm Reporting - added databse upgrade code to scorm/db/upgrade.php MDL-27523 Scorm Reporting - small optimisations MDL-27523 SCorm Reporting - Removing Mod.php MDL-27523 Scorm Reporting - Minor Fixes new file: mod/scorm/db/subplugins.php modified: mod/scorm/lang/en/scorm.php modified: mod/scorm/report.php new file: mod/scorm/report/basic/db/install.php new file: mod/scorm/report/basic/lang/en/scorm_basic.php new file: mod/scorm/report/basic/report.php new file: mod/scorm/report/basic/version.php new file: mod/scorm/report/default.php new file: mod/scorm/report/reportlib.php modified: mod/scorm/tabs.php modified: mod/scorm/userreport.php modified: mod/scorm/db/install.xml new file: mod/scorm/db/subplugins.php modified: mod/scorm/db/upgrade.php modified: mod/scorm/lang/en/scorm.php modified: mod/scorm/report.php new file: mod/scorm/report/basic/db/install.php new file: mod/scorm/report/basic/lang/en/scorm_basic.php new file: mod/scorm/report/basic/report.php new file: mod/scorm/report/basic/version.php new file: mod/scorm/report/default.php new file: mod/scorm/report/reportlib.php modified: mod/scorm/tabs.php modified: mod/scorm/userreport.php modified: mod/scorm/version.php MDL-27523 Scorm Reporting - Removing Database Refereneces MDL-27523 Scorm Reporting - Updating structure to remove DB usage modified: mod/scorm/db/upgrade.php modified: mod/scorm/report.php modified: mod/scorm/report/basic/report.php modified: mod/scorm/report/default.php modified: mod/scorm/report/reportlib.php MDL-27523 Scorm Reporting - Minor fixes MDL-27523 Scorm Reporting - Formating codes MDL-27523 Scorm Reporting - Foramting Codes modified: mod/scorm/report/basic/lang/en/scorm_basic.php modified: mod/scorm/report/basic/report.php modified: mod/scorm/report/default.php modified: mod/scorm/report/reportlib.php new file: mod/scorm/db/subplugins.php modified: mod/scorm/lang/en/scorm.php modified: mod/scorm/report.php new file: mod/scorm/report/basic/lang/en/scorm_basic.php new file: mod/scorm/report/basic/report.php new file: mod/scorm/report/basic/version.php new file: mod/scorm/report/default.php new file: mod/scorm/report/reportlib.php modified: mod/scorm/tabs.php modified: mod/scorm/userreport.php modified: mod/scorm/version.php
moodle · Nov 3, 2011 · b7afad0 · b7afad0
1 parent 735de1c
commit b7afad0
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/mod/scorm/report.php b/mod/scorm/report.php
@@ -8,11 +8,11 @@
 //
 // Moodle is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
 
 // This script uses installed report plugins to print scorm reports
 

diff --git a/mod/scorm/report/basic/lang/en/scorm_basic.php b/mod/scorm/report/basic/lang/en/scorm_basic.php
@@ -0,0 +1,26 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Strings for component 'scorm_basic', language 'en', branch 'MOODLE_20_STABLE'
+ *
+ * @package   scorm_basic
+ * @author    Ankit Kumar Agarwal
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+$string['pluginname'] = 'Basic Reporting';
+
diff --git a/mod/scorm/report/basic/report.php b/mod/scorm/report/basic/report.php
@@ -15,6 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 /**
  * Core Report class of basic reporting plugin
+<<<<<<< HEAD
  * @package    scormreport
  * @subpackage basic
  * @author     Dan Marsden and Ankit Kumar Agarwal
@@ -148,6 +149,7 @@ function display($scorm, $cm, $course, $download) {
                 $table->define_headers($headers);
                 $table->define_baseurl($PAGE->url);
 
+
                 $table->sortable(true);
                 $table->collapsible(true);
 

diff --git a/mod/scorm/tabs.php b/mod/scorm/tabs.php
@@ -15,12 +15,12 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Sets up the tabs used by the scorm pages based on the users capabilities.
- *
- * @author Dan Marsden and others.
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package scorm
- */
+* Sets up the tabs used by the scorm pages based on the users capabilities.
+*
+* @author Dan Marsden and others.
+* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+* @package scorm
+*/
 
 if (empty($scorm)) {
     error('You cannot call this script in that way');