X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=53de695e33061ddc190754d3a71239a147eca8dc;hb=37d22c01cf5181413568afe66ceb6ec716664e04;hp=c4e73ef26180e8887470302d23fa9588f31f34d3;hpb=7bcd66aba8d66b948c78b1ae3dc830888a4693f0;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index c4e73ef..53de695 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -30,6 +30,7 @@ class eq
var $current_month;
var $upload_target_path;
var $script_path;
+ var $max_appointments;
var $public_functions = array
(
@@ -71,6 +72,7 @@ class eq
$this->default_int_num_years = 0;
$this->default_att_num_quarters = 1;
$this->default_vis_num_years = 1;
+ $this->max_appointments = 32768;
$this->upload_target_path = "/home/users/eqpres/eq_data/";
$this->script_path = "/usr/share/phpgroupware/eq/";
@@ -1101,6 +1103,7 @@ class eq
{
$elder_name[$i] = $this->db->f('name');
$elder_id[$i] = $this->db->f('elder');
+ $elder_phone[$elder_id[$i]] = $this->db->f('phone');
$i++;
}
array_multisort($elder_name, $elder_id);
@@ -1115,8 +1118,21 @@ class eq
$assignment_list[$i]['code'] = $this->db->f('code');
$i++;
}
+
+ $sql = "SELECT * FROM eq_activity ORDER BY date DESC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $total_records = $this->db->num_rows();
+
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $activity_list[$i]['assignment'] = $this->db->f('assignment');
+ $activity_list[$i]['date'] = $this->db->f('date');
+ $activity_list[$i]['activity'] = $this->db->f('activity');
+ $i++;
+ }
- $elder_width=230; $willing_width=40; $assignment_width=50;
+ $elder_width=275; $willing_width=40; $assignment_width=50;
$total_width=$elder_width+$willing_width;
for ($i=0; $i < count($assignment_list); $i++) {
@@ -1131,6 +1147,7 @@ class eq
$willing_table = '';
$this->nextmatchs->template_alternate_row_color(&$this->t);
$this->t->set_var('elder_name',$elder_name[$i]);
+ $this->t->set_var('elder_phone',$elder_phone[$elder_id[$i]]);
$this->t->set_var('editurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_update&elder_id='
. $elder_id[$i] . '&action=' . 'edit'));
for ($j=0; $j < count($assignment_list); $j++) {
@@ -1141,9 +1158,26 @@ class eq
$this->db->query($sql,__LINE__,__FILE__);
while($this->db->next_record()) {
$found_willingness=1;
+ $date_part="";
+ $sql = "SELECT * FROM eq_activity where "
+ . " assignment=". $assignment_list[$j]['assignment']
+ . " ORDER by date DESC";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $activity = $this->db2->f('activity');
+ $date = $this->db2->f('date');
+ $sql = "SELECT * FROM eq_participation where "
+ . " activity=" . $activity
+ . " AND elder=". $elder_id[$i];
+ $this->db3->query($sql,__LINE__,__FILE__);
+ if($this->db3->next_record()) {
+ $date_part = $date;
+ }
+ }
+
if($this->db->f('willing') == 'y') {
$total_willing[$j]++;
- $willing_table .= '
![](checkmark.gif) | ';
+ $willing_table .= '![](checkmark.gif) '.$date_part.' | ';
}
else if($this->db->f('willing') == 'n') {
$willing_table .= '![](x.gif) | ';
@@ -3486,7 +3520,7 @@ class eq
$uid = 0;
// Update an existing appointment
- if($appointment != 0)
+ if($appointment < $this->max_appointments)
{
//Only perform a database update if we have made a change to this appointment
$sql = "SELECT * FROM eq_appointment where " .
@@ -3512,10 +3546,10 @@ class eq
}
// Add a new appointment
- else if(($appointment == 0) && ($date != "") && ($time != ""))
+ else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
{
$this->db->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time,uid) "
- . "VALUES ('" . $appointment . "','" . $presidency . "','" . $family . "','"
+ . "VALUES (NULL,'" . $presidency . "','" . $family . "','"
. $elder . "','" . $date . "','" . $time . "','" . $uid ."')",__LINE__,__FILE__);
//print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family
";
@@ -3652,59 +3686,64 @@ class eq
}
// Create blank appointment slot
- $appointment = 0;
- $table_data.= "";
-
- // Date selection
- $table_data.= '';
- $table_data.= $this->jscal->input('sched['.$presidency.']['.$appointment.'][date]','','','','','','',$this->cal_options);
- $table_data.= ' | ';
-
- // Time selection
- $table_data.= "";
- $table_data.= '';
- $table_data.= ' : ';
- $table_data.= '';
- $table_data.= '';
- $table_data.= " | ";
+ for ($b=0; $b < 4; $b++) {
+ $appointment = $this->max_appointments + $b;
+ $table_data.= "
";
+
+ // Date selection
+ $table_data.= '';
+ $table_data.= $this->jscal->input('sched['.$presidency.']['.$appointment.'][date]','','','','','','',$this->cal_options);
+ $table_data.= ' | ';
- // Elder drop down list
- $table_data.= ' | ';
-
- // Family drop down list
- $table_data.= ' | ';
-
- $table_data.= '';
- $table_data.= '';
+ // Time selection
+ $table_data.= "";
+ $table_data.= '';
+ $table_data.= ' : ';
+ $table_data.= '';
+ $table_data.= '';
+ $table_data.= " | ";
+
+ // Elder drop down list
+ $table_data.= ' | ';
+
+ // Family drop down list
+ $table_data.= ' | ';
+
+ $table_data.= '';
+ $table_data.= '';
+
+ $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+ $this->t->set_var('tr_color',$tr_color);
+ }
$this->t->set_var('table_data',$table_data);
$this->t->set_var('header_row',$header_row);