|
From: <sh...@us...> - 2006-09-19 09:48:05
|
Revision: 66
http://svn.sourceforge.net/hw4mdl/?rev=66&view=rev
Author: shazan
Date: 2006-09-19 02:47:52 -0700 (Tue, 19 Sep 2006)
Log Message:
-----------
activity form updated with the weeks and the type directly choose by the widget
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/mod.html
Modified: trunk/moodle/mod/liveclassroom/mod.html
===================================================================
--- trunk/moodle/mod/liveclassroom/mod.html 2006-09-14 15:24:25 UTC (rev 65)
+++ trunk/moodle/mod/liveclassroom/mod.html 2006-09-19 09:47:52 UTC (rev 66)
@@ -26,6 +26,9 @@
if (!isset($form->descrption)) {
$form->descrption = '';
}
+if (!isset($form->section)) {
+ $form->section = '';
+}
if (empty($form->timeopen)) {
$form->timeopen = "";
$form->timerestrict = 0;
@@ -73,13 +76,39 @@
<?php
if($course->format == "weeks"){
- $form->timeopen = $course->startdate + (($form->section - 1) * 608400); ?>
+ //Display the lsit of the weeks
+ $timenow = time();
+ $weekdate = $course->startdate; // this should be 0:00 Monday of that week
+ $weekdate += 7200; // Add two hours to avoid possible DST problems
+ $section = 1;
+ $sectionmenu = array();
+ $weekofseconds = 604800;
+ $course->enddate = $course->startdate + ($weekofseconds * $course->numsections);
+ $k=0;
+ while ($weekdate < $course->enddate) {
+ $nextweekdate = $weekdate + ($weekofseconds);
+ $weekday = userdate($weekdate, '%d %B') ;
+ $endweekday = userdate($weekdate+518400, '%d %B');
+ $list_weeks[$k] = $weekday.' - '.$endweekday;
+ $k++;
+ $section++;
+ $weekdate = $nextweekdate;
+ }
+
+ ?>
<td align="right"><b><?php print_string('weeksformat', 'liveclassroom')?>:</b></td>
<td>
- <?php
- print_date_selector("openday", "openmonth", "openyear", $form->timeopen);
- print_time_selector("openhour", "openminute", $form->timeopen);
- ?>
+ <SELECT name="section">
+ <?php
+ for($i=0;$i<sizeof($list_weeks);$i++) {
+ ?>
+
+ <OPTION <?php if($_GET['section']==$i+1) { echo "selected"; }?> VALUE="<?php p($i+1) ?>"><?php p($list_weeks[$i]) ?></OPTION>
+
+ <?php
+ }
+ ?>
+ </SELECT>
</td>
<?php
}
@@ -94,8 +123,6 @@
</tr>
<?php
}
-
-
?>
</tr>
@@ -117,7 +144,7 @@
for($i=0;$i<sizeof($list_type_rooms);$i++) {
?>
- <OPTION VALUE="<?php p($list_type_rooms[$i]) ?>"><?php p($list_type_rooms[$i]) ?></OPTION>
+ <OPTION <?php if(liveclassroom_get_room_name_from_id($_GET['roomId'])==$list_type_rooms[$i]){ echo "selected"; } ?> VALUE="<?php p($list_type_rooms[$i]) ?>"><?php p($list_type_rooms[$i]) ?></OPTION>
<?php
}
@@ -125,8 +152,6 @@
?>
</SELECT>
</td>
-
-
</tr>
@@ -182,7 +207,7 @@
<input type="hidden" name=course value="<?php p($form->course) ?>" />
<input type="hidden" name="sesskey" value="<?php p($form->sesskey) ?>" />
<input type="hidden" name=coursemodule value="<?php p($form->coursemodule) ?>" />
-<input type="hidden" name=section value="<?php p($form->section) ?>" />
+
<input type="hidden" name=module value="<?php p($form->module) ?>" />
<input type="hidden" name=modulename value="<?php p($form->modulename) ?>" />
<input type="hidden" name=instance value="<?php p($form->instance) ?>" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2006-09-29 13:32:08
|
Revision: 70
http://svn.sourceforge.net/hw4mdl/?rev=70&view=rev
Author: shazan
Date: 2006-09-29 06:31:54 -0700 (Fri, 29 Sep 2006)
Log Message:
-----------
room id add to the instance on creation
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/mod.html
Modified: trunk/moodle/mod/liveclassroom/mod.html
===================================================================
--- trunk/moodle/mod/liveclassroom/mod.html 2006-09-26 13:36:58 UTC (rev 69)
+++ trunk/moodle/mod/liveclassroom/mod.html 2006-09-29 13:31:54 UTC (rev 70)
@@ -5,14 +5,27 @@
require_once($CFG->dirroot.'/calendar/lib.php');
include_once($CFG->dirroot.'/mod/liveclassroom/lib.php');
$id = optional_param('id', 0, PARAM_INT);
+
+ require_once("../config.php");
+
+ require_login($course->id);
- if ($id) {
-
- if (! $course = get_record("course", "id", $id)) {
- error("Course is misconfigured");
- }
-
- }
+ if (!isteacher($course->id, $USER->id)) { //to Be sure
+ error("You need to be a teacher in this course to c reate an instance");
+ }
+
+ // Check if the rooms exist on the server
+ if(!(liveclassroom_api_user_exist($course))){
+ // make sure the profiles exist
+ if (!liveclassroom_create_profiles ($course)) {
+ error ("Cannot create liveclassroom profiles");
+ }
+ liveclassroom_create_rooms ($course);
+ }
+ else {
+
+ }
+
/// First we check that form variables have been initialised
if (!isset($form->name)) {
$form->name = '';
@@ -29,6 +42,7 @@
if (!isset($form->section)) {
$form->section = '';
}
+
if (empty($form->timeopen)) {
$form->timeopen = "";
$form->timerestrict = 0;
@@ -77,11 +91,17 @@
<?php
if($course->format == "weeks"){
//Display the lsit of the weeks
- $timenow = time();
- $weekdate = $course->startdate; // this should be 0:00 Monday of that week
+
+ ?>
+ <td align="right"><b><?php print_string('weeksformat', 'liveclassroom')?>:</b></td>
+ <td>
+ <SELECT name="section">
+ <?php
+
+ $weekdate = $course->startdate; // this should be 0:00 Monday of that week
$weekdate += 7200; // Add two hours to avoid possible DST problems
$section = 1;
- $sectionmenu = array();
+ // $sectionmenu = array();
$weekofseconds = 604800;
$course->enddate = $course->startdate + ($weekofseconds * $course->numsections);
$k=0;
@@ -90,34 +110,58 @@
$weekday = userdate($weekdate, '%d %B') ;
$endweekday = userdate($weekdate+518400, '%d %B');
$list_weeks[$k] = $weekday.' - '.$endweekday;
+ ?>
+ <OPTION <?php if($_GET['section']==$k+1) { echo "selected"; }?> VALUE="<?php p($k+1) ?>"><?php p($list_weeks[$k]) ?></OPTION>
+ <?php
$k++;
$section++;
$weekdate = $nextweekdate;
}
-
- ?>
- <td align="right"><b><?php print_string('weeksformat', 'liveclassroom')?>:</b></td>
- <td>
- <SELECT name="section">
- <?php
- for($i=0;$i<sizeof($list_weeks);$i++) {
+
?>
-
- <OPTION <?php if($_GET['section']==$i+1) { echo "selected"; }?> VALUE="<?php p($i+1) ?>"><?php p($list_weeks[$i]) ?></OPTION>
-
- <?php
- }
- ?>
- </SELECT>
+ </SELECT>
</td>
<?php
}
- else if($course->format == "topics"){ ?>
+ else if($course->format == "topics"){
+ // Delete all the < ...>
+ function supprimer_tags($texte, $rempl = "") {
+ $texte = ereg_replace("< [^>]*>", $rempl, $texte);
+ return $texte;
+ }
+
+ function textebrut($texte) {
+ $texte = ereg_replace("[\n\r]+", " ", $texte);
+ $texte = eregi_replace("< (p|br)([[:space:]][^>]*)?".">", "\n\n", $texte);
+ $texte = ereg_replace("^\n+", "", $texte);
+ $texte = ereg_replace("\n+$", "", $texte);
+ $texte = ereg_replace("\n +", "\n", $texte);
+ $texte = supprimer_tags($texte);
+ $texte = ereg_replace("( | )+", " ", $texte);
+ return $texte;
+ }
+
+ function txt($chaine){
+ return str_replace("<br />", "\n" ,$chaine);
+ }
+ ?>
<tr valign="top">
- <td align="right"><b><?php print_string("topicformat") ?>:</b></td>
+ <td align="right"><b><?php print_string('topicformat', 'liveclassroom') ?>:</b></td>
<td>
- <select>
- <option value="">
+ <select name="section">
+ <?php
+ $section = 1;
+ while ($section <= $course->numsections) {
+ if (!$thissection = get_record('course_sections', 'course',$course->id, 'section', $section)) {
+ notify('Error getting course_sections!');
+ }
+
+ ?>
+ <OPTION <?php if($_GET['section']==$section) { echo "selected"; }?> title="<?php p($thissection->summary) ?>" value="<?php p($section) ?>">Topic <?php p($section) ?></OPTION>
+ <?php
+ $section++;
+ }
+ ?>
</select>
</td>
</tr>
@@ -131,20 +175,16 @@
<td>
<?php
include_once($CFG->dirroot.'/mod/liveclassroom/lib.php');
- //Get the list of type of rooms available
- if(!(liveclassroom_api_user_exist($course))){
- $list_type_rooms = liveclassroom_get_list_type_rooms_first_time();
- }
- else {
- $list_type_rooms = liveclassroom_get_list_type_rooms($course);
- }?>
+
+ $list_type_rooms = liveclassroom_get_list_type_rooms($course);
+ ?>
<SELECT name="type">
<?php
for($i=0;$i<sizeof($list_type_rooms);$i++) {
?>
- <OPTION <?php if(liveclassroom_get_room_name_from_id($_GET['roomId'])==$list_type_rooms[$i]){ echo "selected"; } ?> VALUE="<?php p($list_type_rooms[$i]) ?>"><?php p($list_type_rooms[$i]) ?></OPTION>
+ <OPTION <?php if(($_GET['roomId']!=null)&&(liveclassroom_get_room_name_from_id($_GET['roomId']))==$list_type_rooms[$i]){ echo "selected"; } ?> VALUE="<?php p(liveclassroom_get_room_id($course,$list_type_rooms[$i])) ?>"><?php p($list_type_rooms[$i]) ?></OPTION>
<?php
}
@@ -152,6 +192,7 @@
?>
</SELECT>
</td>
+
</tr>
@@ -183,26 +224,8 @@
</td>
</tr>
-
-
-<!--
-
-<table width="100%" border="1" bgcolor="#DDDDDD" cellpadding="0">
-<tr border="1">
- <td>
- <font color="red">*</font><?php print_string('requiredfields', 'liveclassroom')?>
- </td>
- <td align="right">
- <input type="reset" value="<?php print_string("cancel") ?>" />
- <input type="submit" value="<?php print_string("add") ?>" />
- </td>
-
-
</table>
-</tr>
--->
-</table>
<!-- These hidden variables are always the same -->
<input type="hidden" name=course value="<?php p($form->course) ?>" />
<input type="hidden" name="sesskey" value="<?php p($form->sesskey) ?>" />
@@ -214,5 +237,4 @@
<input type="hidden" name=mode value="<?php p($form->mode) ?>" />
</center>
-
</form>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2006-10-10 12:24:13
|
Revision: 79
http://svn.sourceforge.net/hw4mdl/?rev=79&view=rev
Author: shazan
Date: 2006-10-10 05:24:04 -0700 (Tue, 10 Oct 2006)
Log Message:
-----------
add activity form update
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/mod.html
Modified: trunk/moodle/mod/liveclassroom/mod.html
===================================================================
--- trunk/moodle/mod/liveclassroom/mod.html 2006-10-10 12:22:30 UTC (rev 78)
+++ trunk/moodle/mod/liveclassroom/mod.html 2006-10-10 12:24:04 UTC (rev 79)
@@ -81,7 +81,7 @@
<tr valign="top">
<td align="right"><b><font color="red">*</font><?php print_string("name") ?>:</b></td>
- <td>
+ <td align="left">
<input type="text" name="name" size="30" value="">
</td>
</tr>
@@ -90,35 +90,38 @@
<?php
if($course->format == "weeks"){
- //Display the lsit of the weeks
+ //Display the list of the weeks
?>
<td align="right"><b><?php print_string('weeksformat', 'liveclassroom')?>:</b></td>
- <td>
+ <td align="left">
<SELECT name="section">
<?php
-
- $weekdate = $course->startdate; // this should be 0:00 Monday of that week
- $weekdate += 7200; // Add two hours to avoid possible DST problems
- $section = 1;
- // $sectionmenu = array();
- $weekofseconds = 604800;
- $course->enddate = $course->startdate + ($weekofseconds * $course->numsections);
- $k=0;
- while ($weekdate < $course->enddate) {
- $nextweekdate = $weekdate + ($weekofseconds);
- $weekday = userdate($weekdate, '%d %B') ;
- $endweekday = userdate($weekdate+518400, '%d %B');
- $list_weeks[$k] = $weekday.' - '.$endweekday;
- ?>
- <OPTION <?php if($_GET['section']==$k+1) { echo "selected"; }?> VALUE="<?php p($k+1) ?>"><?php p($list_weeks[$k]) ?></OPTION>
- <?php
- $k++;
- $section++;
- $weekdate = $nextweekdate;
- }
-
+
+ $weekdate = $course->startdate; // this should be 0:00 Monday of that week
+ $weekdate += 7200; // Add two hours to avoid possible DST problems
+ $section = 1;
+ // $sectionmenu = array();
+ $weekofseconds = 604800;
+ $course->enddate = $course->startdate + ($weekofseconds * $course->numsections);
+ $list_weeks[0]="Section 0"; //For first section
+ $k=1;
+ while ($weekdate < $course->enddate) {
+ $nextweekdate = $weekdate + ($weekofseconds);
+ $weekday = userdate($weekdate, '%d %B') ;
+ $endweekday = userdate($weekdate+518400, '%d %B');
+ $list_weeks[$k] = $weekday.' - '.$endweekday;
+
+ $k++;
+ $section++;
+ $weekdate = $nextweekdate;
+ }
+ for($l=0;$l<sizeof($list_weeks);$l++){
?>
+ <OPTION <?php if($_GET['section']==$l) { echo "selected"; }?> VALUE="<?php p($l) ?>"><?php p($list_weeks[$l]) ?></OPTION>
+ <?php
+ }
+ ?>
</SELECT>
</td>
<?php
@@ -147,10 +150,10 @@
?>
<tr valign="top">
<td align="right"><b><?php print_string('topicformat', 'liveclassroom') ?>:</b></td>
- <td>
+ <td align="left">
<select name="section">
<?php
- $section = 1;
+ $section = 0;
while ($section <= $course->numsections) {
if (!$thissection = get_record('course_sections', 'course',$course->id, 'section', $section)) {
notify('Error getting course_sections!');
@@ -172,10 +175,10 @@
<tr valign="top">
<td align="right"><b><?php print_string('liveclassroomtype', 'liveclassroom')?>:</b></td>
- <td>
+ <td align="left">
<?php
include_once($CFG->dirroot.'/mod/liveclassroom/lib.php');
-
+
$list_type_rooms = liveclassroom_get_list_type_rooms($course);
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2006-10-13 12:35:35
|
Revision: 83
http://svn.sourceforge.net/hw4mdl/?rev=83&view=rev
Author: shazan
Date: 2006-10-13 05:35:24 -0700 (Fri, 13 Oct 2006)
Log Message:
-----------
mod.html updated with the new database format
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/mod.html
Modified: trunk/moodle/mod/liveclassroom/mod.html
===================================================================
--- trunk/moodle/mod/liveclassroom/mod.html 2006-10-13 12:34:26 UTC (rev 82)
+++ trunk/moodle/mod/liveclassroom/mod.html 2006-10-13 12:35:24 UTC (rev 83)
@@ -2,6 +2,8 @@
<!-- It is used from /course/mod.php. The whole instance is available as $form. -->
<?php
+session_start();
+
require_once($CFG->dirroot.'/calendar/lib.php');
include_once($CFG->dirroot.'/mod/liveclassroom/lib.php');
$id = optional_param('id', 0, PARAM_INT);
@@ -178,16 +180,20 @@
<td align="left">
<?php
include_once($CFG->dirroot.'/mod/liveclassroom/lib.php');
-
- $list_type_rooms = liveclassroom_get_list_type_rooms($course);
+ $rooms = liveclassroom_api_get_room_list($_SESSION['teacherid'],$course);
+
+
+
+ //$list_type_rooms = liveclassroom_get_list_type_rooms($course);
?>
<SELECT name="type">
<?php
- for($i=0;$i<sizeof($list_type_rooms);$i++) {
+ // for($i=0;$i<sizeof($list_type_rooms);$i++) {
+ foreach($rooms as $room) {
?>
- <OPTION <?php if(($_GET['roomId']!=null)&&(liveclassroom_get_room_name_from_id($_GET['roomId']))==$list_type_rooms[$i]){ echo "selected"; } ?> VALUE="<?php p(liveclassroom_get_room_id($course,$list_type_rooms[$i])) ?>"><?php p($list_type_rooms[$i]) ?></OPTION>
+ <OPTION <?php if(($_GET['roomId']!=null)&&($_GET['roomId']==$room[0])){ echo "selected"; } ?> VALUE="<?php p($room[0]) ?>"><?php p($room[1]) ?></OPTION>
<?php
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2006-10-13 12:41:57
|
Revision: 85
http://svn.sourceforge.net/hw4mdl/?rev=85&view=rev
Author: shazan
Date: 2006-10-13 05:41:52 -0700 (Fri, 13 Oct 2006)
Log Message:
-----------
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/mod.html
Modified: trunk/moodle/mod/liveclassroom/mod.html
===================================================================
--- trunk/moodle/mod/liveclassroom/mod.html 2006-10-13 12:36:54 UTC (rev 84)
+++ trunk/moodle/mod/liveclassroom/mod.html 2006-10-13 12:41:52 UTC (rev 85)
@@ -180,11 +180,9 @@
<td align="left">
<?php
include_once($CFG->dirroot.'/mod/liveclassroom/lib.php');
- $rooms = liveclassroom_api_get_room_list($_SESSION['teacherid'],$course);
-
-
-
- //$list_type_rooms = liveclassroom_get_list_type_rooms($course);
+ $teacherid = liveclassroom_api_get_teacher_user_id($course->shortname);
+ $rooms = liveclassroom_api_get_room_list($teacherid,$course);
+
?>
<SELECT name="type">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2006-12-18 09:24:59
|
Revision: 112
http://svn.sourceforge.net/hw4mdl/?rev=112&view=rev
Author: shazan
Date: 2006-12-18 01:24:56 -0800 (Mon, 18 Dec 2006)
Log Message:
-----------
add cancel link if no room is available
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/mod.html
Modified: trunk/moodle/mod/liveclassroom/mod.html
===================================================================
--- trunk/moodle/mod/liveclassroom/mod.html 2006-12-15 15:22:58 UTC (rev 111)
+++ trunk/moodle/mod/liveclassroom/mod.html 2006-12-18 09:24:56 UTC (rev 112)
@@ -133,6 +133,9 @@
if (confirm("No room available. You must create a room, then add it to an activity.")) {
location.href = "<?php echo $CFG->wwwroot;?>/mod/liveclassroom/index.php?id=<?php echo $id;?>&noliveclassroom=true";
}
+ else {
+ location.href = "<?php echo $CFG->wwwroot;?>/course/view.php?id=<?php p($id)?>";
+ }
<?php
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
