Changeset 238
- Timestamp:
- 01/18/12 16:39:27 (13 years ago)
- Location:
- Dev/branches/jos-branch
- Files:
-
- 1 added
- 11 edited
-
classes/styles/Logo.php (modified) (2 diffs)
-
classes/widgets/SessionEditorWidget.php (modified) (2 diffs)
-
classes/widgets/SurveyEditorWidget.php (modified) (1 diff)
-
createObject.php (modified) (1 diff)
-
getObject.php (modified) (2 diffs)
-
js/questionEditorScripts.js (modified) (3 diffs)
-
js/sequencerScripts.js (modified) (1 diff)
-
mainmenu.php (modified) (2 diffs)
-
saveSurvey.php (modified) (3 diffs)
-
savesession.php (modified) (3 diffs)
-
selectObject.php (added)
-
selectSession.php (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
Dev/branches/jos-branch/classes/styles/Logo.php
r230 r238 14 14 // hardcoded logo div, image is defined in stylesheet. (#logo background:"";) 15 15 public function __construct() { 16 if (isset($_SESSION['userUid'])) { 17 $users = User::get(array("uid" => $_SESSION['userUid'])); 18 $user = $users[0]; 19 $loggedIn = true; 20 $message = "Welcome, " . $user->name . "!"; 21 } else { 22 $message = "Please log in."; 23 $loggedIn = false; 24 } 16 25 ?> 17 26 … … 21 30 </div> 22 31 <div id="logoControls"> 23 Welcome, Igor! <a href="logout.php">Log out</a> 32 <?php echo $message; ?> 33 34 <?php 35 if ($loggedIn == true) { 36 echo "<a href='logout.php'>Log out</a>"; 37 } 38 ?> 24 39 </div> 25 40 </div> -
Dev/branches/jos-branch/classes/widgets/SessionEditorWidget.php
r230 r238 52 52 <input type="button" id="editSelected" value="Edit step" class="smallButton" onClick="editStep();" /> 53 53 <input type="button" id="deleteSelected" value="Delete step" class="smallButton" onClick="deleteStep();" /> 54 <input type="submit" id ="clearPipeline" name="clearPipeline" value="Clear pipeline" class="smallButton dis" disabled="true"/>55 <input type="checkbox" id="confirmClear" name="confirmClear" onChange="IsCheckEnabled(this, document.getElementById('clearPipeline'));" />Really clear?56 54 <input type="button" value="debug_save" onClick="savePipeline(true);" /> 57 55 </div> … … 91 89 public function LoadSession() { // Initialize variables on page load. 92 90 // Redirect if no session is set 93 if (!isset($_ SESSION['currentSession'])) {91 if (!isset($_POST['objectUid'])) { 94 92 redirect("selectSession.php"); 95 93 } 96 // Store the current session in internal variable97 $results = Session::get(array("uid"=> $_ SESSION['currentSession']));94 95 $results = Session::get(array("uid"=> $_POST['objectUid'])); 98 96 //print_r($results); 99 97 if (!empty($results)) { -
Dev/branches/jos-branch/classes/widgets/SurveyEditorWidget.php
r235 r238 15 15 16 16 public function __construct() { 17 17 // Nothing yet 18 18 } 19 19 20 20 public function handlePost() { 21 21 // Get POSTed data and store variables to class instance properties 22 22 23 23 if (isset($_POST['objectUid']) && !empty($_POST['objectUid'])) { 24 24 $surveyResults = Survey::get(array("uid" => $_POST['objectUid'])); 25 25 if (!empty($surveyResults)) { 26 26 $this->loadedSurvey = $surveyResults[0]; 27 $this->loadedSurvey->evaluate(); 27 28 } else { 28 29 die("No surveys found!"); -
Dev/branches/jos-branch/createObject.php
r233 r238 43 43 $uid = $newQuestion->uid; 44 44 break; 45 case "session": 46 if (isset($_POST['newSessionName']) && !empty($_POST['newSessionName'])) { 47 $newSession = new Session(null, $_POST['newSessionName'], $creator, new DateTime(), null, null); 48 $newSession->save(); 49 $uid = $newSession->uid; 50 } else { 51 die("No session name specified!"); 52 } 53 54 55 break; 45 56 default: 46 57 //die ("Variable \$otc: $otc does not match a compatible object type!"); -
Dev/branches/jos-branch/getObject.php
r237 r238 14 14 foreach ($requestArray as $request) { 15 15 $type = $request->type; 16 $results = $type::get(array("uid" => $request->uid)); 16 17 if (isset($request->uid)) { 18 $results = $type::get(array("uid" => $request->uid)); 19 } else if (isset($request->title)) { 20 $results = $type::get(array("title" => $request->title)); 21 } 22 17 23 18 24 if (isset($results) && !empty($results) && count($results) > 0) { … … 20 26 $results[0]->objectType = $type; 21 27 $resultArray[] = $results[0]; 22 } 23 else { 24 $resultArray[] = array("uid"=>"Not found!"); 28 } else { 29 $resultArray[] = false; //Insert a false return so that the calling JS code knows when an object is not found 25 30 } 26 31 } -
Dev/branches/jos-branch/js/questionEditorScripts.js
r237 r238 24 24 // Properties 25 25 this.uid = null; // The uid of the question contained in this editor 26 this.saved = false; // Whether or not the question displayed in the editor has been saved already. 26 27 var me = this; // Retarded self-reference because: Javascript 27 28 this.element = null; // The parent div element containing the questionEditor … … 73 74 this.init = function() { 74 75 // Outer div 76 this.saved = false; 75 77 me.element = ce("div"); 76 78 me.element.className = "smallFrame questionEditor"; … … 248 250 } 249 251 this.discard = function() { 250 me.element.parentNode.removeChild(me.element); 251 me.init(); 252 sequencer.state.loaded = true; 253 sequencer.state.editing = false; 252 debugger; 253 me.element.parentNode.removeChild(me.element); 254 me.init(); 255 sequencer.state.loaded = true; 256 sequencer.state.editing = false; 257 sequencer.survey.questions.upToDate[sequencer.survey.questions.uids.indexOf(me.uid)] = false; 258 updateSequencer(); 259 254 260 } 255 261 this.reset = function() { -
Dev/branches/jos-branch/js/sequencerScripts.js
r237 r238 759 759 //console.log(requestString); 760 760 newAjaxRequest(requestString, "savesession.php", function(result){ 761 //console.log(result.responseText);761 console.log(result.responseText); 762 762 }, true); 763 763 } -
Dev/branches/jos-branch/mainmenu.php
r235 r238 10 10 <?php new StyleSheet("visualeditors"); ?> 11 11 <script type="text/javascript" src="js/generalScripts.js"></script> 12 <script type="text/javascript"> 13 function browseSessions() { 14 // This one doesn't use the objectSelector yet. Just redirect to selectSession.php 15 window.location = 'selectSession.php'; 16 } 17 18 function browseSurveys() { 19 var form = ce("form"); 20 form.method = "POST"; 21 form.action = "selectObject.php"; 22 var input1 = ce("input"); 23 input1.name = "objectType"; 24 input1.value = "Survey"; 25 var input2 = ce("input"); 26 input2.name = "function"; 27 input2.value = "redirEditor"; 28 form.appendChild(input1); 29 form.appendChild(input2); 30 form.submit(); 31 } 32 33 function browseQuestions() { 34 var form = ce("form"); 35 form.method = "POST"; 36 form.action = "selectObject.php"; 37 var input1 = ce("input"); 38 input1.name = "objectType"; 39 input1.value = "Question"; 40 var input2 = ce("input"); 41 input2.name = "function"; 42 input2.value = "redirEditor"; 43 form.appendChild(input1); 44 form.appendChild(input2); 45 form.submit(); 46 } 47 48 function browseApplications() { 49 var form = ce("form"); 50 form.method = "POST"; 51 form.action = "selectObject.php"; 52 var input1 = ce("input"); 53 input1.name = "objectType"; 54 input1.value = "Application"; 55 var input2 = ce("input"); 56 input2.name = "function"; 57 input2.value = "redirEditor"; 58 form.appendChild(input1); 59 form.appendChild(input2); 60 form.submit(); 61 } 62 </script> 12 63 </head> 13 64 <body> … … 22 73 <div class="innerLargeFrame"> 23 74 <p>Use the below buttons to access, edit and create new sessions and content.</p><br /> 24 <input type="button" class="bigButton vertical" value="Browse Sessions" id="btn EditSessions" onClick="window.location='selectSession.php'" /><br />25 <input type="button" class="bigButton vertical" value="Browse Surveys" id="btn EditSessions" onClick="window.location='selectSurvey.php'" /><br />26 <input type="button" class="bigButton vertical" value="Browse Questions" id="btn EditSessions" onClick="window.location='selectQuestion.php'" /><br />27 <input type="button" class="bigButton vertical" value="Browse Applications" id="btn EditSessions" onClick="window.location='selectApplication.php'" /><br />75 <input type="button" class="bigButton vertical" value="Browse Sessions" id="btnBrowseSessions" onClick="browseSessions()" /><br /> 76 <input type="button" class="bigButton vertical" value="Browse Surveys" id="btnBrowseSurveys" onClick="browseSurveys()" /><br /> 77 <input type="button" class="bigButton vertical" value="Browse Questions" id="btnBrowseQuestions" onClick="browseQuestions()" /><br /> 78 <input type="button" class="bigButton vertical" value="Browse Applications" id="btnBrowseApplications" onClick="browseApplications()" /><br /> 28 79 29 80 </div> -
Dev/branches/jos-branch/saveSurvey.php
r208 r238 18 18 // Query the survey object from the database. 19 19 20 $dbi = new DatabaseInterface(); 21 $survey_results = $dbi->get("Survey", array("uid" => $args->uid)); 20 $survey_results = Survey::get(array("uid" => $args->uid)); 22 21 if (!empty($survey_results)) { 23 22 $survey = $survey_results[0]; … … 28 27 $question->questions = array(); 29 28 foreach ($args->questions->uids as $questionUid) { 30 $question_results = $dbi->get("Question", array("code"=>$questionUid));29 $question_results = Question::get(array("uid"=>$questionUid)); 31 30 $question = $question_results[0]; 32 31 $survey->questions[] = $question; … … 40 39 } 41 40 */ 42 var_dump($survey);41 //var_dump($survey); 43 42 // Do I need to check if this is done before proceeding? 44 $ dbi->set($survey);43 $survey->save(); 45 44 ?> -
Dev/branches/jos-branch/savesession.php
r208 r238 11 11 if (!empty($_POST['uids']) && !empty($_POST['types']) && !empty($_POST['sessionUid'])) { 12 12 // user has passed a pipeline/type string from javascript in order to save the session. 13 $ pl= explode(",", $_POST['uids']);14 $t = explode(",", $_POST['types']);13 $uids = explode(",", $_POST['uids']); 14 $types = explode(",", $_POST['types']); 15 15 16 16 $sessionUid = $_POST['sessionUid']; 17 //var_dump($t); 18 $dbi = new DatabaseInterface(); 19 $session_results = $dbi->get("Session", array("uid" => $sessionUid)); 17 $session_results = Session::get(array("uid" => $sessionUid)); 20 18 if (count($session_results) > 0) { 21 19 $session = $session_results[0]; … … 24 22 die(); 25 23 } 26 if (count($ pl) == count($t)) {27 $count = count($ pl);24 if (count($uids) == count($types)) { 25 $count = count($uids); 28 26 } else { 29 27 echo "!!!!!!!!!!!!!!!!!NON MATCHING ARGUMENTS PASSED!!!!!!!!!!!!!!!"; 30 28 die(); 31 29 } 32 30 33 31 $session->pipeline = array(); 34 32 for ($i = 0; $i < $count; $i++) { 35 $results = $dbi->get($t[$i], array("uid" => $pl[$i])); 33 $type = $types[$i]; 34 $results = $type::get(array("uid" => $uids[$i])); 36 35 if (count($results) > 0) { 37 36 $result = $results[0]; … … 40 39 } 41 40 42 $ dbi->set($session);41 $session->save(); 43 42 //var_dump($session); 44 43 } -
Dev/branches/jos-branch/selectSession.php
r235 r238 23 23 $creator = $creators[0]; 24 24 $session = new Session(null, $_POST['newSessionName'], $creator, new DateTime(), null, null); 25 25 $session->save(); 26 26 } else { 27 27 $errorMessage[] = "A session with the name " . $_POST['newSessionName'] . " already exists!"; … … 40 40 41 41 if (isset($_POST['editSession'])) { 42 42 var_dump($_POST); 43 43 if (isset($_POST['sessionUid'])) { 44 44 $session_results = Session::get((array("uid" => $_POST['sessionUid']))); 45 45 var_dump($session_results); 46 46 if (count($session_results) == 1 && $session_results[0] != null) { 47 47 // DEZE SESSION MOET UITEINDELIJK EEN POST WORDEN, WANNEER DEZE HELE PAGINA IS OVERGEZET IN JAVASCRIPT! … … 66 66 <script type="text/javascript" src="js/sequencerScripts.js"></script> 67 67 <script type="text/javascript" src="js/generalScripts.js"></script> 68 <script type="text/javascript"> 69 function sendToEditor() { 70 debugger; 71 var uid = ge('objectUid').value; 72 if (uid.length == 32) { 73 // A valid uid has actually been passed 74 var form = ce("form"); 75 form.method = "POST"; 76 form.action = "sessionEditor.php"; 77 var input = ce("input"); 78 input.name = "objectUid"; 79 input.value = uid; 80 form.appendChild(input); 81 form.submit(); 82 } 83 } 84 85 function createNewSession() { 86 //debugger; 87 var desiredName = ge('newSessionName').value; 88 if (desiredName.length < 1) return; 89 var request = Array({ 90 type: "Session", 91 title: desiredName 92 }); 93 var requestString = "args="+JSON.stringify(request); 94 newAjaxRequest(requestString, "getObject.php", function(result){ 95 debugger; 96 console.log(result.responseText); 97 var session = JSON.parse(result.responseText)[0]; 98 if (session != false) { 99 alert("Session with that name already exists. Please choose a different name."); 100 } 101 else { 102 var requestString = "objectToCreate=Session&newSessionName="+desiredName; 103 104 newAjaxRequest(requestString, "createObject.php", function(result){ 105 var objectUid = result.responseText; 106 if (objectUid.length != 32) return; 107 var form = ce("form"); 108 form.method = "POST"; 109 form.action = "sessionEditor.php"; 110 var input = ce("input"); 111 input.value = objectUid; 112 input.name = "objectUid"; 113 form.appendChild(input); 114 form.submit(); 115 },false); 116 } 117 }, false); 118 } 119 </script> 68 120 </head> 69 121 <body> … … 79 131 <form action="selectSession.php" method="POST"> 80 132 <div style="float: left; clear: left;"> 81 <select name="sessionUid" style="float: left;" onChange="ajaxInfoRequest(this.value, document.getElementById('infoPanelContent'), 'Session');">133 <select id ="objectUid" name="objectUid" style="float: left;" onChange="ajaxInfoRequest(this.value, document.getElementById('infoPanelContent'), 'Session');"> 82 134 <option value="" disabled="true" selected>Please select a session</option> 83 135 <?php … … 93 145 </select> 94 146 <input type="hidden" name="updateNeeded" value="true" /> 95 <input type="text" name="newSessionName" value="Name..." style="float: left; clear: left;" /><br />147 <input type="text" id="newSessionName" name="newSessionName" value="Name..." style="float: left; clear: left;" /><br /> 96 148 </div> 97 149 <div style="float: left; clear: none;"> 98 <input type=" submit" name="createSession" value="Create new session" class="smallButton vertical" style="float: left;" />99 <input type=" submit" name="editSession" value="Edit session" class="smallButton vertical" style="float: left;" />150 <input type="button" onclick="createNewSession();" name="createSession" value="Create new session" class="smallButton vertical" style="float: left;" /> 151 <input type="button" name="editSession" value="Edit session" class="smallButton vertical" style="float: left;" onclick="sendToEditor();" /> 100 152 <input type="submit" name="deleteSession" value="Delete session" class="smallButton vertical" style="float: left;" /> 101 153 </div>
Note: See TracChangeset
for help on using the changeset viewer.
