From 0464366e8f222177cae9bf07abc8c9e80dc3ec3c Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Sat, 29 Nov 2014 21:21:26 +0000 Subject: [PATCH] Conference Center: Added schedule (start/stop) fields to Conference Room edit gui. Back end forthcoming. --- app/conference_centers/app_config.php | 13 ++++++ app/conference_centers/app_languages.php | 20 ++++++++ .../conference_room_edit.php | 46 +++++++++++++------ app/conference_centers/conference_rooms.php | 27 +++-------- 4 files changed, 71 insertions(+), 35 deletions(-) diff --git a/app/conference_centers/app_config.php b/app/conference_centers/app_config.php index 750e582049..25c0050878 100644 --- a/app/conference_centers/app_config.php +++ b/app/conference_centers/app_config.php @@ -112,6 +112,11 @@ $apps[$x]['permissions'][$y]['groups'][] = "admin"; $apps[$x]['permissions'][$y]['groups'][] = "user"; $y++; + $apps[$x]['permissions'][$y]['name'] = "conference_room_schedule"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $apps[$x]['permissions'][$y]['groups'][] = "admin"; + $apps[$x]['permissions'][$y]['groups'][] = "user"; + $y++; $apps[$x]['permissions'][$y]['name'] = "conference_room_announce"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; @@ -260,6 +265,14 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Limit number of people in the conference."; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "start_datetime"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Open the conference room at the start time."; + $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "stop_datetime"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Close the conference room at the stop time."; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "wait_mod"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Wait for the moderator to join before starting the conference."; diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php index 0303de6949..ae27ba9244 100644 --- a/app/conference_centers/app_languages.php +++ b/app/conference_centers/app_languages.php @@ -268,6 +268,26 @@ $text['label-max-members']['pt-pt'] = "Nº máximo de membros"; $text['label-max-members']['fr-fr'] = "Membres Max"; + $text['label-schedule']['en-us'] = "Schedule"; + $text['label-schedule']['es-cl'] = "Horario"; + $text['label-schedule']['pt-pt'] = "Horário"; + $text['label-schedule']['fr-fr'] = "Calendrier"; + + $text['description-schedule']['en-us'] = "Set a start and stop date/time for this room."; + $text['description-schedule']['es-cl'] = "Establezca un inicio y parada de fecha/hora para esta sala."; + $text['description-schedule']['pt-pt'] = "Definir uma partida e parada de data/hora para este quarto."; + $text['description-schedule']['fr-fr'] = "Définir un démarrage et d'arrêt de date/heure pour cette chambre."; + + $text['label-from']['en-us'] = "From"; + $text['label-from']['es-cl'] = "Desde"; + $text['label-from']['pt-pt'] = "A Partir De"; + $text['label-from']['fr-fr'] = "A Partir De"; + + $text['label-to']['en-us'] = "To"; + $text['label-to']['es-cl'] = "Final"; + $text['label-to']['pt-pt'] = "Final"; + $text['label-to']['fr-fr'] = "Fin"; + $text['label-wait-for-moderator']['en-us'] = "Wait for Moderator"; $text['label-wait-for-moderator']['es-cl'] = "Esperar un Moderador"; $text['label-wait-for-moderator']['pt-pt'] = "Esperar pelo Moderador"; diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index 88d832a32d..c9e8aa0362 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -59,6 +59,8 @@ else { $record = check_str($_POST["record"]); $user_uuid = check_str($_POST["user_uuid"]); $max_members = check_str($_POST["max_members"]); + $start_datetime = check_str($_POST["start_datetime"]); + $stop_datetime = check_str($_POST["stop_datetime"]); $wait_mod = check_str($_POST["wait_mod"]); $announce = check_str($_POST["announce"]); $sounds = check_str($_POST["sounds"]); @@ -214,6 +216,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { //check for all required data //if (strlen($conference_center_uuid) == 0) { $msg .= "Please provide: Conference UUID
\n"; } //if (strlen($max_members) == 0) { $msg .= "Please provide: Max Members
\n"; } + //if (strlen($start_datetime) == 0) { $msg .= "Please provide: Start Date/Time
\n"; } + //if (strlen($stop_datetime) == 0) { $msg .= "Please provide: Stop Date/Time
\n"; } //if (strlen($wait_mod) == 0) { $msg .= "Please provide: Wait for the Moderator
\n"; } //if (strlen($profile) == 0) { $msg .= "Please provide: Conference Profile
\n"; } //if (strlen($announce) == 0) { $msg .= "Please provide: Announce
\n"; } @@ -285,6 +289,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "profile, "; $sql .= "record, "; $sql .= "max_members, "; + $sql .= "start_datetime, "; + $sql .= "stop_datetime, "; $sql .= "wait_mod, "; $sql .= "announce, "; $sql .= "sounds, "; @@ -303,6 +309,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "'$profile', "; $sql .= "'$record', "; $sql .= "'$max_members', "; + $sql .= "'$start_datetime', "; + $sql .= "'$stop_datetime', "; $sql .= "'$wait_mod', "; $sql .= "'$announce', "; $sql .= "'$sounds', "; @@ -379,6 +387,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { if (strlen($max_members) > 0) { $sql .= "max_members = '$max_members', "; } + if (strlen($start_datetime) > 0) { + $sql .= "start_datetime = '".$start_datetime."', "; + } + if (strlen($stop_datetime) > 0) { + $sql .= "stop_datetime = '".$stop_datetime."', "; + } if (strlen($wait_mod) > 0) { $sql .= "wait_mod = '$wait_mod', "; } @@ -451,6 +465,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $profile = $row["profile"]; $record = $row["record"]; $max_members = $row["max_members"]; + $start_datetime = $row["start_datetime"]; + $stop_datetime = $row["stop_datetime"]; $wait_mod = $row["wait_mod"]; $announce = $row["announce"]; $sounds = $row["sounds"]; @@ -495,18 +511,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { require_once "resources/header.php"; //show the content - echo "
"; - echo "\n"; - echo "\n"; - echo " "; - echo " "; - echo "
\n"; - echo "
"; - echo "
\n"; - echo "
\n"; - echo "\n"; + + echo "
\n"; echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; } + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + if (permission_exists('conference_room_wait_mod')) { echo "\n"; echo "\n"; echo " "; echo "
".$text['title-conference-rooms']."\n"; + echo "".$text['title-conference-rooms']."\n"; echo " \n"; if (strlen($meeting_uuid) > 0) { echo " \n"; @@ -662,6 +672,17 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "
\n"; + echo " ".$text['label-schedule']."\n"; + echo "\n"; + echo " \n"; + echo " \n"; + echo "
".$text['description-schedule']; + echo "
\n"; @@ -860,12 +881,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "
"; + echo ""; - echo "
"; - echo "
"; //include the footer require_once "resources/footer.php"; diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php index 99424d736b..564370a082 100644 --- a/app/conference_centers/conference_rooms.php +++ b/app/conference_centers/conference_rooms.php @@ -150,24 +150,18 @@ else { $order = $_GET["order"]; //show the content - echo "
"; - echo "\n"; - echo "\n"; - echo " "; - echo ""; - echo "
\n"; - echo "
"; - - echo "\n"; + echo "
\n"; echo " \n"; echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo "
".$text['title-conference-rooms']."\n"; + echo " ".$text['title-conference-rooms']."\n"; echo " "; echo " "; echo "
\n"; - echo "
\n"; + echo "

\n"; //get the conference room count require_once "app/conference_centers/resources/classes/conference_center.php"; @@ -210,7 +204,6 @@ else { $row_style["1"] = "row_style1"; //table header - echo "
\n"; echo "\n"; echo "\n"; //echo th_order_by('conference_center_uuid', 'Conference UUID', $order_by, $order); @@ -220,7 +213,7 @@ else { //echo th_order_by('profile', $text['label-profile'], $order_by, $order); echo th_order_by('record', $text['label-record'], $order_by, $order); //echo th_order_by('max_members', 'Max', $order_by, $order); - echo th_order_by('wait_mod', $text['label-wait-moderator'], $order_by, $order); + echo th_order_by('wait_mod', $text['label-moderator'], $order_by, $order); echo th_order_by('announce', $text['label-announce'], $order_by, $order); //echo th_order_by('enter_sound', 'Enter Sound', $order_by, $order); echo th_order_by('mute', $text['label-mute'], $order_by, $order); @@ -373,15 +366,7 @@ else { //close the tables echo "
"; - echo "
"; - echo "

"; - echo "

"; - - echo "
"; - echo "
"; - echo "

"; + echo "

"; //include the footer require_once "resources/footer.php";