merged rev.445

admin/bulkappointment.php

@@ -278,7 +278,7 @@ else
 	<div class="col-sm-4">
 		<input name="file" class="filestyle" type="file" required data-buttonBefore="true" data-iconName="fa fa-folder-open fa-lg text-primary " data-buttonText="<?php  echo T_("Select file"); ?>" type="file" accept="<?php echo $csv; ?>"/>&emsp;
 	</div>
-	<button type="submit" class="btn btn-primary" name="import_file" value=""><i class='fa fa-upload fa-lg'></i>&emsp;<?php  echo "" . T_("Upload file"); ?></button>
+	<button type="submit" class="btn btn-primary" name="import_file" value=""><i class='fa fa-upload fa-lg'></i>&emsp;<?php  echo T_("Upload file"); ?></button>
 	
 	</form>
 

admin/new.php

@@ -233,7 +233,7 @@ $surveys = $db->GetAll($sql);
 	<div class="form-group">
 		<label class="col-sm-4 control-label" ><?php  echo T_("Allow for respondent self completion via email invitation?"); ?> </label>
 		<div class="col-sm-4"style="height: 30px;">
-			<input name="respsc" type="checkbox"  onchange="if(this.checked==true) show(this,'limesc'); else hide(this,'limesc');" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" data-width="80"/>
+			<input name="respsc" type="checkbox"  onchange="if(this.checked==true) {show(this,'limesc'); $('#url').attr('required','required');} else{ hide(this,'limesc'); $('#url').removeAttr('required');}" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" data-width="80"/>
 		</div>
 	</div>
 	
@@ -269,7 +269,7 @@ $surveys = $db->GetAll($sql);
 	<div class="form-group">
 		<label class="col-sm-4 control-label text-danger" ><?php echo T_("URL to forward respondents on self completion (required)");?>: </label>
 		<div class="col-sm-4">
-			<input class="form-control"  name="lime_endurl" type="url" value="<?php print SITE_URL ;?>" />
+			<input class="form-control"  name="lime_endurl" id="url" type="url" placeholder="<?php print SITE_URL ;?>" />
 		</div>
 	</div>
 </div>

admin/questionnairelist.php

@@ -314,7 +314,7 @@ if (isset($_GET['modify']))
 	}
 
 	xhtml_head(T_("Modify Questionnaire "),true,$css,$js_head, false, false, false, " &ensp;<span class=' text-uppercase'>" . "$rs[description]" . "</span>");
-
+	
 	$CKEditor = new CKEditor();
 	$CKEditor->basePath = "../include/ckeditor/";
 
@@ -361,7 +361,7 @@ if (isset($_GET['modify']))
 	</div>
 	<div class="form-group">
 		<label class="col-sm-4 control-label" ><?php  echo T_("Allow for respondent self completion via email invitation?"); ?> </label>
-		<div class="col-sm-4" style="height: 30px;"><input name="respsc" id="respsc" type="checkbox" <?php echo $rsc ?> onchange="if(this.checked==true) show(this,'limesc'); else hide(this,'limesc');" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" data-width="80"/></div>
+		<div class="col-sm-4" style="height: 30px;"><input name="respsc" id="respsc" type="checkbox" <?php echo $rsc ?> onchange="if(this.checked==true) {show(this,'limesc'); $('#url').attr('required','required');} else{ hide(this,'limesc'); $('#url').removeAttr('required');}" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" data-width="80"/></div>
 	</div>
 <div id="limesc" <?php echo $rscd; ?> >
 <div class="form-group">
@@ -396,7 +396,7 @@ if (isset($_GET['modify']))
 	<div class="form-group">
 		<label class="col-sm-4 control-label text-danger" ><?php echo T_("URL to forward respondents on self completion (required)");?>: </label>
 		<div class="col-sm-4">
-			<input class="form-control" name="lime_endurl" type="url" required placeholder="<?php print SITE_URL ;?>" value="<?php echo $rs['lime_endurl']; ?>"/>
+			<input class="form-control" name="lime_endurl" id="url" type="url" placeholder="<?php print SITE_URL ;?>" value="<?php echo $rs['lime_endurl']; ?>"/>
 		</div>
 	</div>
 </div>
@@ -566,5 +566,5 @@ print "</div>";
 xhtml_foot($js_foot);
 ?>
 <script type="text/javascript">
-$('[data-toggle="confirmation"]').confirmation()
+$('[data-toggle="confirmation"]').confirmation();
 </script>

admin/quotarow.php

@@ -123,7 +123,7 @@ if (isset($_GET['questionnaire_id']) && isset($_GET['questionnaire_sample_quota_
 $questionnaire_id = false;
 if (isset($_GET['questionnaire_id'])) 	$questionnaire_id = bigintval($_GET['questionnaire_id']);
 
-xhtml_head(T_("Quota row management"),true,array("../include/bootstrap-3.3.2/css/bootstrap.min.css","../css/custom.css"),array("../js/window.js"));
+xhtml_head(T_("Quota row management"),true,array("../include/bootstrap-3.3.2/css/bootstrap.min.css","../include/bootstrap-toggle/css/bootstrap-toggle.min.css","../css/custom.css"),array("../js/jquery-2.1.3.min.js","../include/bootstrap-toggle/js/bootstrap-toggle.min.js","../js/window.js"));
 print "<h3 class='form-inline pull-left'>" . T_("Questionnaire") . ":&emsp;</h3>";
 
 $sql = "SELECT questionnaire_id as value,description, CASE WHEN questionnaire_id = '$questionnaire_id' THEN 'selected=\'selected\'' ELSE '' END AS selected
@@ -295,7 +295,7 @@ if ($questionnaire_id != false)
 				<input type="number" class="form-control" name="priority" id="priority" value="50" min="0" max="100" style="width:5em;"/></p>
 				
 				<p><label for="autoprioritise"><?php  echo T_("Should the priority be automatically updated ?</br> (based on the number of completions in this quota)"); ?>&emsp;</label>
-				<input type="checkbox" name="autoprioritise" id="autoprioritise"/></p>
+				<input type="checkbox" name="autoprioritise" id="autoprioritise" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" data-offstyle="warning"/></p>
 				<?php  if ($sgqa != -1) { if ($sgqa != -2) { ?>
 				
 				<p><label for="comparison"><?php  echo T_("The type of comparison"); ?>:&emsp;</label>

admin/systemsort.php

@@ -98,9 +98,7 @@ else
 	//print "<h2>" . T_("Monitor system wide case sorting") . "</h2>";
 	print "<p><a href='?watch=watch'>" . T_("Click here to enable and begin system wide case sorting") . "</a></p>";
 	print "<div class='well pull-right col-sm-4'><p>"  . T_("System wide case sorting is periodically (via SYSTEM_SORT_MINUTES configuration directive) sorting cases on a system wide basis instead of finding the most appropriate case each time an operator requests a new case. This may increase performance where there are a large number of cases or complex quotas in place. If you are not experiencing any performance problems, it is not recommended to use this feature.") . "</p></div>";
-	
 	print "<h2>" . T_("Outcome of last process run (if any)") . "</h2>";
-	
 	$d = process_get_last_data(2);
         if ($d !== false)
         {

admin/systemsortprocess.php

@@ -258,11 +258,11 @@ while (!is_process_killed($process_id)) //check if process killed every $sleepin
   		AND ((qsep.questionnaire_id is NULL) or qsep.exclude = 0)
   		AND !(q.restrict_work_shifts = 1 AND sh.shift_id IS NULL)
   		AND !(si.call_restrict = 1 AND cr.day_of_week IS NULL)
-  		AND ((apn.appointment_id IS NOT NULL) or qs.call_attempt_max = 0 or ((SELECT count(*) FROM call_attempt WHERE case_id = c.case_id) < qs.call_attempt_max))
+  		AND ((apn.appointment_id IS NOT NULL) or qs.call_attempt_max = 0 or ((SELECT count(*) FROM call_attempt WHERE call_attempt.case_id = c.case_id) < qs.call_attempt_max))
-  		AND ((apn.appointment_id IS NOT NULL) or qs.call_max = 0 or ((SELECT count(*) FROM `call` WHERE case_id = c.case_id) < qs.call_max))
+  		AND ((apn.appointment_id IS NOT NULL) or qs.call_max = 0 or ((SELECT count(*) FROM `call` WHERE `call`.case_id = c.case_id) < qs.call_max))
     	AND (SELECT count(*) FROM `questionnaire_sample_quota` WHERE questionnaire_id = c.questionnaire_id AND sample_import_id = s.import_id AND quota_reached = 1) = 0
   		GROUP BY c.case_id
-  		ORDER BY IF(ISNULL(apn.end),1,0), apn.end ASC, qsep.priority DESC, a.start ASC";
+  		ORDER BY IF(ISNULL(apn.end),1,0), apn.end ASC, a.start ASC, qsep.priority DESC";
     
   	$rs = $db->GetAll($sql);
 

functions/functions.limesurvey.php

@@ -293,7 +293,7 @@ function limesurvey_quota_replicate_completions($lime_sid,$questionnaire_id,$sam
 
   $sql = "SELECT COUNT(*)
           FROM information_schema.tables
-          WHERE table_schema = 'quexs'
+          WHERE table_schema = '".DB_NAME."'
           AND table_name = '" . LIME_PREFIX . "survey_$lime_sid'";
 
   $rs = $db->GetOne($sql);
@@ -402,7 +402,7 @@ function limesurvey_quota_completions($lime_sgqa,$lime_sid,$questionnaire_id,$sa
 
   $sql = "SELECT COUNT(*)
           FROM information_schema.tables
-          WHERE table_schema = 'quexs'
+          WHERE table_schema = '".DB_NAME."'
           AND table_name = '" . LIME_PREFIX . "survey_$lime_sid'";
 
   $rs = $db->GetOne($sql);
@@ -432,18 +432,18 @@ function limesurvey_quota_completions($lime_sgqa,$lime_sid,$questionnaire_id,$sa
  * Based on GetQuotaInformation() from common.php in Limesurvey
  *
  * @param int $lime_quota_id The quota id to get information on
- * @param string $baselang The base language for getting information from questions
  * @return array An array containing the question information for comparison
  */
-function get_limesurvey_quota_info($lime_quota_id,$baselang = DEFAULT_LOCALE)
+function get_limesurvey_quota_info($lime_quota_id)
 {
 	global $db;
 
 	$ret = array();
 
-	$sql = "SELECT *
+	$sql = "SELECT q.*,s.language
-		FROM ".LIME_PREFIX."quota_members
+		FROM ".LIME_PREFIX."quota_members as q, ".LIME_PREFIX."surveys as s
-		WHERE quota_id='$lime_quota_id'";
+    WHERE q.quota_id='$lime_quota_id'
+    AND s.sid = q.sid";
 	
 	$rs = $db->GetAll($sql);
 
@@ -451,11 +451,12 @@ function get_limesurvey_quota_info($lime_quota_id,$baselang = DEFAULT_LOCALE)
 	{
 		$lime_qid = $quota_entry['qid'];
 		$surveyid = $quota_entry['sid'];
+		$language = $quota_entry['language'];
 
 		$sql = "SELECT type, title,gid
 			FROM ".LIME_PREFIX."questions
 			WHERE qid='$lime_qid' 
-			AND language='$baselang'";
+			AND language='$language'";
 
 		$qtype = $db->GetRow($sql);
 	

waitnextcase_interface2.php

@@ -29,7 +29,7 @@
  * 
  *
  */
- 
+
 /**
  * Language file
  */
@@ -62,7 +62,6 @@ if (isset($_GET['auto']))
 <ul class="wait_wrapper">
 	<li class="wait_li_1"><a href="index_interface2.php"><?php  echo T_("Get a new case"); ?> <img src="css/images/play.jpg" /></a></li>
     <li class="wait_li_2"><a href="endwork.php"><?php  echo T_("End work"); ?> <img src="css/images/end.jpg" /></a></li>
-
 </ul>
 
 <?php