Index: temp_moodle_dev/lamstwo/add.php =================================================================== diff -u -ra6b67669ecc2aa5b2a1546521a12d36210eee6af -rc440b24fcf2fa3d03b1820c66628ac217d56344a --- temp_moodle_dev/lamstwo/add.php (.../add.php) (revision a6b67669ecc2aa5b2a1546521a12d36210eee6af) +++ temp_moodle_dev/lamstwo/add.php (.../add.php) (revision c440b24fcf2fa3d03b1820c66628ac217d56344a) @@ -31,7 +31,7 @@ update_module_button($cm->id, $course->id, get_string('modulename', 'lamstwo')), navmenu($course, $cm)); $mform_add = new mod_lamstwo_add_form('add.php', - array('course'=>$course, 'lamstwo'=>$lamstwo)); + array('course'=>$course, 'lamstwo'=>$lamstwo, 'customCSV'=>"$USER->username,$course->id,$cm->section")); // Form processing if ($form = $mform_add->get_data()) { @@ -51,4 +51,4 @@ $mform_add->display(); print_footer($course); -?> \ No newline at end of file +?> Index: temp_moodle_dev/lamstwo/add_form.php =================================================================== diff -u -ra6b67669ecc2aa5b2a1546521a12d36210eee6af -rc440b24fcf2fa3d03b1820c66628ac217d56344a --- temp_moodle_dev/lamstwo/add_form.php (.../add_form.php) (revision a6b67669ecc2aa5b2a1546521a12d36210eee6af) +++ temp_moodle_dev/lamstwo/add_form.php (.../add_form.php) (revision c440b24fcf2fa3d03b1820c66628ac217d56344a) @@ -5,22 +5,23 @@ class mod_lamstwo_add_form extends moodleform { - function definition() { - global $USER; + function definition() { + global $USER; - $mform =& $this->_form; + $mform =& $this->_form; - $course = $this->_customdata['course']; - $lamstwo = $this->_customdata['lamstwo']; + $course = $this->_customdata['course']; + $lamstwo = $this->_customdata['lamstwo']; + $customcsv = $this->_customdata['customCSV']; - $mform->addElement('header', 'general', 'Your new LAMS lesson'); - - $mform->addElement('text', 'name', 'Lesson name', 'size="48"'); - $mform->setType('name', PARAM_TEXT); - $mform->addRule('name', get_string('required'), 'required', null, 'client'); + $mform->addElement('header', 'general', 'Your new LAMS lesson'); - $mform->addElement('htmleditor', 'intro', 'Introduction'); - $mform->setType('intro', PARAM_RAW); + $mform->addElement('text', 'name', 'Lesson name', 'size="48"'); + $mform->setType('name', PARAM_TEXT); + $mform->addRule('name', get_string('required'), 'required', null, 'client'); + + $mform->addElement('htmleditor', 'intro', 'Introduction'); + $mform->setType('intro', PARAM_RAW); $mform->setHelpButton('intro', array('richtext'), false, 'editorhelpbutton'); // display user's lams workspace @@ -50,39 +51,42 @@ $this->add_action_buttons(false, 'Add lesson'); $mform->addElement('hidden', 'course', $course->id); - $mform->setType('course', PARAM_INT); + $mform->setType('course', PARAM_INT); - $mform->addElement('hidden', 'lamstwo', $lamstwo->id); - $mform->setType('lamstwo', PARAM_INT); + $mform->addElement('hidden', 'customCSV', $customcsv); + $mform->setType('customCSV', PARAM_TEXT); - $mform->addElement('hidden', 'groupid'); - $mform->setType('groupid', PARAM_INT); + $mform->addElement('hidden', 'lamstwo', $lamstwo->id); + $mform->setType('lamstwo', PARAM_INT); + + $mform->addElement('hidden', 'groupid'); + $mform->setType('groupid', PARAM_INT); - // value filled after submit by lamstwo_add_instance - $mform->addElement('hidden', 'lesson_id'); - $mform->setType('lesson_id', PARAM_INT); + // value filled after submit by lamstwo_add_instance + $mform->addElement('hidden', 'lesson_id'); + $mform->setType('lesson_id', PARAM_INT); - // value filled by javascript when user selects a sequence - $mform->addElement('hidden', 'sequence_id'); - $mform->setType('sequence_id', PARAM_INT); - //$mform->addRule('sequence_id', get_string('required'), 'required', null, 'client'); - } + // value filled by javascript when user selects a sequence + $mform->addElement('hidden', 'sequence_id'); + $mform->setType('sequence_id', PARAM_INT); + //$mform->addRule('sequence_id', get_string('required'), 'required', null, 'client'); + } - function validation($data) { - $errors = array(); - // scheduled date needs to be in the future - if (isset($data['schedule']) && $data['schedule']) { - if ($data['schedulestart'] <= date('U')) { - $errors['schedulestart'] = get_string('nopast', 'lamstwo'); - } - } - // a sequence needs to be selected - if (empty($data['sequence_id']) || $data['sequence_id'] <= 0) { - $errors['sequencemessage'] = get_string('sequencenotselected', 'lamstwo'); - } - return $errors; - } + function validation($data) { + $errors = array(); + // scheduled date needs to be in the future + if (isset($data['schedule']) && $data['schedule']) { + if ($data['schedulestart'] <= date('U')) { + $errors['schedulestart'] = get_string('nopast', 'lamstwo'); + } + } + // a sequence needs to be selected + if (empty($data['sequence_id']) || $data['sequence_id'] <= 0) { + $errors['sequencemessage'] = get_string('sequencenotselected', 'lamstwo'); + } + return $errors; + } } -?> \ No newline at end of file +?> Index: temp_moodle_dev/lamstwo/lib.php =================================================================== diff -u -rbdc4cb08d7a885e883b3b2634b998a8b2c8bfaa1 -rc440b24fcf2fa3d03b1820c66628ac217d56344a --- temp_moodle_dev/lamstwo/lib.php (.../lib.php) (revision bdc4cb08d7a885e883b3b2634b998a8b2c8bfaa1) +++ temp_moodle_dev/lamstwo/lib.php (.../lib.php) (revision c440b24fcf2fa3d03b1820c66628ac217d56344a) @@ -385,29 +385,29 @@ } // start the lesson - $form->lesson_id = lamstwo_get_lesson( - $USER->username, $form->sequence_id, $form->course, - $form->name, $form->intro, $form->start_date, - $locale['country'], $locale['lang'] - ); + $form->lesson_id = lamstwo_get_lesson( + $USER->username, $form->sequence_id, $form->course, + $form->name, $form->intro, $form->start_date, + $locale['country'], $locale['lang'], $form->customCSV + ); - if (!isset($form->lesson_id) || $form->lesson_id <= 0) { - return false; - } + if (!isset($form->lesson_id) || $form->lesson_id <= 0) { + return false; + } - if (!$form->id = insert_record('lamstwo_lesson', $form)) { - return false; - } - //print_r($form); + if (!$form->id = insert_record('lamstwo_lesson', $form)) { + return false; + } + //print_r($form); $members = lamstwo_get_members($form->course, $form->lamstwo, $form->groupid); - // call threaded lams servlet to populate the class - $result = lamstwo_fill_lesson($USER->username, $form->lesson_id, - $form->course, $locale['country'], $locale['lang'], $members['learners'], $members['monitors'] - ); + // call threaded lams servlet to populate the class + $result = lamstwo_fill_lesson($USER->username, $form->lesson_id, + $form->course, $locale['country'], $locale['lang'], $members['learners'], $members['monitors'] + ); - return $form->id; + return $form->id; } @@ -455,7 +455,7 @@ * @param string $lang The Language's ISO code * @return int lesson id */ -function lamstwo_get_lesson($username,$ldid,$courseid,$title,$desc,$startdate,$country,$lang) { +function lamstwo_get_lesson($username,$ldid,$courseid,$title,$desc,$startdate,$country,$lang,$customcsv='') { //echo "enter lamstwo_get_lesson
"; global $CFG, $USER; if (!isset($CFG->lamstwo_serverid, $CFG->lamstwo_serverkey) || $CFG->lamstwo_serverid == "") { @@ -487,7 +487,7 @@ */ if($startdate){ - $parameters = array($CFG->lamstwo_serverid,$datetime,$hashvalue,$username,$ldid,$courseid,$title,$desc,$startdate,$country,$lang); + $parameters = array($CFG->lamstwo_serverid,$datetime,$hashvalue,$username,$ldid,$courseid,$title,$desc,$startdate,$country,$lang,$customcsv); $result = $s->call('scheduleLesson',$parameters); /*$service = "/services/xml/LessonManager"; $request = "$CFG->lamstwo_serverurl$service?method=schedule&serverId=$CFG->lamstwo_serverid&datetime=$datetime_encoded&hashValue=$hashvalue&username=$username&ldId=$ldid&courseId=$courseid&title=$title&desc=$desc&startdate=$startdate&country=$country&lang=$lang"; @@ -498,7 +498,7 @@ print_r($http_response_header); echo "
\n$xml
\n";*/ }else{ - $parameters = array($CFG->lamstwo_serverid,$datetime,$hashvalue,$username,$ldid,$courseid,$title,$desc,$country,$lang); + $parameters = array($CFG->lamstwo_serverid,$datetime,$hashvalue,$username,$ldid,$courseid,$title,$desc,$country,$lang,$customcsv); $result = $s->call('startLesson',$parameters); /*$service = "/services/xml/LessonManager"; $request = "$CFG->lamstwo_serverurl$service?method=start&serverId=$CFG->lamstwo_serverid&datetime=$datetime_encoded&hashValue=$hashvalue&username=$username&ldId=$ldid&courseId=$courseid&title=$title&desc=$desc&country=$country&lang=$lang"; Index: temp_moodle_dev/lamstwo/view.php =================================================================== diff -u -rbdc4cb08d7a885e883b3b2634b998a8b2c8bfaa1 -rc440b24fcf2fa3d03b1820c66628ac217d56344a --- temp_moodle_dev/lamstwo/view.php (.../view.php) (revision bdc4cb08d7a885e883b3b2634b998a8b2c8bfaa1) +++ temp_moodle_dev/lamstwo/view.php (.../view.php) (revision c440b24fcf2fa3d03b1820c66628ac217d56344a) @@ -60,23 +60,24 @@ //--> XXX; - $customcsv = "$USER->username,$course->id,$cm->section"; + $customcsv = "$USER->username,$course->id,$cm->section"; $authorurl = lamstwo_get_url($USER->username, $locale['lang'], $locale['country'], 0, $course->id, $LAMS2CONSTANTS->author_method, $customcsv); - echo $openauthorjs; + echo $openauthorjs; - echo '
'; - echo '
'; - echo "  "; - echo "
wwwroot/mod/lamstwo/add.php\">"; - echo '
'; - echo "id\" />"; - echo ""; - echo ''; - echo '
'; - echo '
'; - echo "
\n"; + echo '
'; + echo '
'; + echo "  "; + echo "
wwwroot/mod/lamstwo/add.php\">"; + echo '
'; + echo ""; + echo "id\" />"; + echo ""; + echo ''; + echo '
'; + echo '
'; + echo "
\n"; } // Log the lamstwo view.