X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=5b1679d8cfeb5a273327d66b261497b8cbcd6b1c;hb=9dc519979d37f94ab0bec341d3508819cd3b68d3;hp=4353336403bf8e297ac86476ff725364ee109aee;hpb=7f49cfecd568149694b414ae0663ae428a01bc71;p=eq%2F.git

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 4353336..5b1679d 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -63,6 +63,7 @@ class eq
      'send_ical_appt' => True,
      'assign_view'    => True,
      'assign_update'  => True,
+     'get_time_selection_form' => True,
      );
  
   function eq()
@@ -78,6 +79,10 @@ class eq
       $this->default_att_num_quarters = 1;
       $this->default_vis_num_years = 1;
       $this->max_num_districts = 4;
+      $this->time_drop_down_lists = 1;
+      $this->time_drop_down_list_inc = 15;
+      $this->default_visit_appt_duration = 45;
+      $this->default_ppi_appt_duration = 30;
       $this->max_presidency_members = 99;
       $this->max_appointments = 32768;
       // END LOCAL CONFIGURATION
@@ -1903,12 +1908,12 @@ class eq
 	      }
 	      
 	      // If this companionship has had a hometeaching interview this quarter, don't show them on the schedule list
-	      $sql = "SELECT * FROM eq_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' ".
+	      $sql = "SELECT * FROM eq_ppi WHERE date >= '$quarter_start' AND date < '$quarter_end' ".
 		 "AND elder=" . $id;
 	      $this->db2->query($sql,__LINE__,__FILE__);
 	      
 	      if(!$this->db2->next_record()) {
-		$sql = "SELECT * FROM eq_interview WHERE elder=" . $id . " ORDER BY date DESC";
+		$sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " ORDER BY date DESC";
 		$this->db3->query($sql,__LINE__,__FILE__);
 		if($this->db3->next_record()) { $date = $this->db3->f('date'); } else { $date = ""; }
 		$link_data['menuaction'] = 'eq.eq.int_update';
@@ -2459,6 +2464,7 @@ class eq
 			   "   ppi='" . $ppi . "'" .
 		    ", interviewer='" . $interviewer . "'" .
 			  ", elder='" . $elder . "'" .
+			", aaronic='" . $aaronic . "'" .
 			   ", date='" . $date . "'" .
 			  ", notes='" . $notes . "'" .
 	              ", eqpresppi='" . $eqpresppi . "'" .
@@ -2470,8 +2476,8 @@ class eq
       if($action == 'insert')
 	{
 	  $notes = get_var('notes',array('POST'));
-	  $this->db->query("INSERT INTO eq_ppi (interviewer,elder,date,notes,eqpresppi) "
-			   . "VALUES ('" . $interviewer . "','" . $elder . "','"
+	  $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) "
+			   . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
 			   . $date . "','" . $notes . "','" . $eqpresppi  ."')",__LINE__,__FILE__);
 	  $this->ppi_view();
 	  return false;
@@ -2673,7 +2679,7 @@ class eq
 		$month_start = "$year"."-"."$month"."-"."01";
 		$month_end = "$year"."-"."$month"."-"."31";
 		$month = "$month"."/"."$year";
-		$sql = "SELECT * FROM eq_interview WHERE date >= '$month_start' AND date <= '$month_end' ".
+		$sql = "SELECT * FROM eq_ppi WHERE date >= '$month_start' AND date <= '$month_end' ".
 		   "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id;
 		$this->db2->query($sql,__LINE__,__FILE__);
 		$header_row .= "<th width=$int_width><font size=-2>$month</th>";
@@ -2784,14 +2790,14 @@ class eq
       if($action == 'save')
 	{
 	  $notes = get_var('notes',array('POST'));
-	  $this->db->query("UPDATE eq_interview set " .
-		     "   interview='" . $interview . "'" .
+	  $this->db->query("UPDATE eq_ppi set " .
+		           "   ppi='" . $interview . "'" .
 		    ", interviewer='" . $interviewer . "'" .
 			  ", elder='" . $elder . "'" .
 			", aaronic='" . $aaronic . "'" .
 			   ", date='" . $date . "'" .
 			  ", notes='" . $notes . "'" .
-			   " WHERE interview=" . $interview,__LINE__,__FILE__);
+			   " WHERE ppi=" . $interview,__LINE__,__FILE__);
 	  $this->int_view();
 	  return false;
 	}
@@ -2799,7 +2805,7 @@ class eq
       if($action == 'insert')
 	{
 	  $notes = get_var('notes',array('POST'));
-	  $this->db->query("INSERT INTO eq_interview (interviewer,elder,aaronic,date,notes) "
+	  $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes) "
 			   . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
 			   . $date . "','" . $notes ."')",__LINE__,__FILE__);
 	  $this->int_view();
@@ -2824,7 +2830,7 @@ class eq
 
       if($action == 'edit' || $action == 'view')
 	{
-	  $sql = "SELECT * FROM eq_interview WHERE interview=".$interview;
+	  $sql = "SELECT * FROM eq_ppi WHERE ppi=".$interview;
 	  $this->db->query($sql,__LINE__,__FILE__);
 	  $this->db->next_record();
 	  $this->t->set_var('interview',$interview);
@@ -3690,24 +3696,7 @@ class eq
 	    
 	    // Hour & Minutes selection
 	    $table_data.= "<td align=center>";
-	    $table_data.= '<select name=sched['.$presidency.']['.$appointment.'][hour]>';
-	    foreach(range(1,12) as $num) {
-	      if($hour == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
-	      $table_data.= '<option value='.$num.' '.$selected[$num].'>'.$num.'</option>';
-	    }
-	    $table_data.= '</select>';
-	    $table_data.= '&nbsp;:&nbsp;';
-	    $table_data.= '<select name=sched['.$presidency.']['.$appointment.'][minute]>';
-	    foreach(range(0,3) as $num) {
-	      $num = $num * 15; if($num == 0) { $num = "00"; }
-	      if($minute == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
-	      $table_data.= '<option value='.$num.' '.$selected[$num].'>'.$num.'</option>';
-	    }
-	    $table_data.= '</select>';
-	    $table_data.= '<select name=sched['.$presidency.']['.$appointment.'][pm]>';
-	    if($pm == 0) { $table_data.= '<option value=0 selected>am</option>'; $table_data.= '<option value=1>pm</option>'; }
-	    else { $table_data.= '<option value=0>am</option>'; $table_data.= '<option value=1 selected>pm</option>'; }
-	    $table_data.= '</select>';
+	    $table_data .= $this->get_time_selection_form($hour, $minute, $pm, $presidency, $appointment);
 	    $table_data.= "</td>";
 	    
 	    // Elder drop down list (for PPIs)
@@ -3752,25 +3741,7 @@ class eq
 	
 	  // Time selection
 	  $table_data.= "<td align=center>";
-	  $table_data.= '<select name=sched['.$presidency.']['.$appointment.'][hour]>';
-	  $table_data.= '<option value=""></option>';
-	  foreach(range(1,12) as $num) {
-	    $table_data.= '<option value='.$num.' '.$selected[$num].'>'.$num.'</option>';
-	  }
-	  $table_data.= '</select>';
-	  $table_data.= '&nbsp;:&nbsp;';
-	  $table_data.= '<select name=sched['.$presidency.']['.$appointment.'][minute]>';
-	  $table_data.= '<option value=""></option>';
-	  foreach(range(0,3) as $num) {
-	    $num = $num * 15; if($num == 0) { $num = "00"; }
-	    $table_data.= '<option value='.$num.'>'.$num.'</option>';
-	  }
-	  $table_data.= '</select>';
-	  $table_data.= '<select name=sched['.$presidency.']['.$appointment.'][pm]>';
-	  $table_data.= '<option value=""></option>';
-	  $table_data.= '<option value=0>am</option>';
-	  $table_data.= '<option value=1>pm</option>';
-	  $table_data.= '</select>';
+	  $table_data .= $this->get_time_selection_form(0, 0, 0, $presidency, $appointment);
 	  $table_data.= "</td>";
 	  
 	  // Elder drop down list
@@ -4238,7 +4209,7 @@ class eq
 	      $phone = $this->db2->f('phone');
 	      $appt_name = $elder_name . " Interview";
 	      $location = "$interviewer"."'s home";
-	      $duration = 1800; // 30 minutes
+	      $duration = $this->default_ppi_appt_duration * 60;
 	    }
 	  }
 
@@ -4260,7 +4231,7 @@ class eq
 	      if($this->db3->next_record()) {
 		$location=$this->db3->f('address');
 	      }
-	      $duration = 2700; // 45 minutes
+	      $duration = $this->default_visit_appt_duration * 60;
 	    }
 	  }
 
@@ -4379,6 +4350,57 @@ class eq
       mail($to, $subject, $message, $headers);
       
     }
+
+  function get_time_selection_form($hour, $minute, $pm, $presidency, $appointment)
+    {
+      $form_data = "";
+      $blank = 0;
+      
+      if($hour == 0) { $blank = 1; }
+
+      if($this->time_drop_down_lists == 1) {
+	// Create drop down lists to get the time
+	$form_data.= '<select name=sched['.$presidency.']['.$appointment.'][hour]>';
+	if($blank == 1) { $form_data.= '<option value=""></option>'; }
+	foreach(range(1,12) as $num) {
+	  if($hour == $num) { $selected = 'selected="selected"'; } else { $selected = ''; }
+	  $form_data.= '<option value='.$num.' '.$selected.'>'.$num.'</option>';
+	}
+	$form_data.= '</select>';
+	$form_data.= '&nbsp;:&nbsp;';
+	$form_data.= '<select name=sched['.$presidency.']['.$appointment.'][minute]>';
+	if($blank == 1) { $form_data.= '<option value=""></option>'; }
+	$num = 0;
+	while($num < 60) {
+	  if($num < 10) { $num = "0" . "$num"; }
+	  if($minute == $num) { $selected = 'selected="selected"'; } else { $selected = ''; }
+	  if($blank == 1) { $selected = ""; }
+	  $form_data.= '<option value='.$num.' '.$selected.'>'.$num.'</option>';
+	  $num = $num + $this->time_drop_down_list_inc;
+	}
+	$form_data.= '</select>';
+      } else {
+	// Use free form text fields to get the time
+	if($blank == 1) { $hour = ""; $minute = ""; $ampm = ""; }
+	$form_data.= '<input type=text size=2 name=sched['.$presidency.']['.$appointment.'][hour] value='.$hour.'>';
+	$form_data.= ':';
+	$form_data.= '<input type=text size=2 name=sched['.$presidency.']['.$appointment.'][minute] value='.$minute.'>';
+	$form_data.= '&nbsp;';
+      }
+      // Always use a drop-down select form for am/pm
+      $form_data.= '<select name=sched['.$presidency.']['.$appointment.'][pm]>';
+      if($blank == 0) { 
+	if($pm == 0) { $form_data.= '<option value=0 selected>am</option>'; $form_data.= '<option value=1>pm</option>'; }
+	if($pm == 1) { $form_data.= '<option value=0>am</option>'; $form_data.= '<option value=1 selected>pm</option>'; }
+      } else {
+	$form_data.= '<option value=""></option>';
+	$form_data.= '<option value=0>am</option>';
+	$form_data.= '<option value=1>pm</option>';
+      }
+      $form_data.= '</select>';
+      
+      return $form_data;
+    }
 }
 
 ?>