X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;ds=inline;f=inc%2Fclass.eq.inc.php;h=1b33e7452a2a1e3a00a96e57b163b0f0a1276f2c;hb=5f83e645f1ddac17fc64013713267a4c4ff3c9d6;hp=ab486562700611841d1376e335e7597c99d1172d;hpb=f4f7ff069f8d87117e673446e0fc4ce98f696de3;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index ab48656..1b33e74 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -55,7 +55,9 @@ class eq
'schedule' => True,
'admin' => True,
'email_appt' => True,
- 'send_ical_appt' => True
+ 'send_ical_appt' => True,
+ 'assign_view' => True,
+ 'assign_update' => True,
);
function eq()
@@ -125,6 +127,9 @@ class eq
$link_data['menuaction'] = 'eq.eq.act_list';
$this->t->set_var('link_activity',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('lang_activity','Activities');
+ $link_data['menuaction'] = 'eq.eq.assign_view';
+ $this->t->set_var('link_assignment',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+ $this->t->set_var('lang_assignment','Assignments');
$link_data['menuaction'] = 'eq.eq.par_view';
$this->t->set_var('link_participation',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('lang_participation','Participation');
@@ -571,6 +576,7 @@ class eq
$this->t->set_var('lang_name','Activity Name');
$this->t->set_var('lang_date','Date');
+ $this->t->set_var('lang_notes','Description');
$sql = "SELECT * FROM eq_activity ORDER BY date DESC";
$this->db->query($sql,__LINE__,__FILE__);
@@ -579,9 +585,18 @@ class eq
$i = 0;
while ($this->db->next_record())
{
- $activity_list[$i]['name'] = $this->db->f('name');
- $activity_list[$i]['date'] = $this->db->f('date');
$activity_list[$i]['activity'] = $this->db->f('activity');
+ $activity_list[$i]['assignment'] = $this->db->f('assignment');
+ $activity_list[$i]['date'] = $this->db->f('date');
+ $activity_list[$i]['notes'] = $this->db->f('notes');
+
+ $sql = "SELECT * FROM eq_assignment WHERE assignment='" . $activity_list[$i]['assignment'] . "'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record())
+ {
+ $activity_list[$i]['name'] = $this->db2->f('name');
+ $activity_list[$i]['code'] = $this->db2->f('code');
+ }
$i++;
}
@@ -590,6 +605,9 @@ class eq
$this->nextmatchs->template_alternate_row_color(&$this->t);
$this->t->set_var('name',$activity_list[$i]['name']);
$this->t->set_var('date',$activity_list[$i]['date']);
+ $activity_notes = $activity_list[$i]['notes'];
+ if(strlen($activity_notes) > 40) { $activity_notes = substr($activity_notes,0,40) . "..."; }
+ $this->t->set_var('notes',$activity_notes);
$link_data['menuaction'] = 'eq.eq.act_view';
$link_data['activity'] = $activity_list[$i]['activity'];
@@ -624,13 +642,20 @@ class eq
$sql = "SELECT * FROM eq_activity WHERE activity=" . intval(get_var('activity',array('GET','POST')));
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
- $this->t->set_var('name', $this->db->f('name'));
+ $this->t->set_var('assignment', $this->db->f('assignment'));
$this->t->set_var('date', $this->db->f('date'));
$this->t->set_var('notes', $this->db->f('notes'));
-
+
+ $sql = "SELECT * FROM eq_assignment WHERE assignment='" . $this->db->f('assignment') . "'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record())
+ {
+ $this->t->set_var('name', $this->db2->f('name'));
+ $this->t->set_var('code', $this->db2->f('code'));
+ }
$this->t->set_var('lang_name','Activity Name');
$this->t->set_var('lang_date','Date');
- $this->t->set_var('lang_notes','Notes');
+ $this->t->set_var('lang_notes','Description');
$this->t->set_var('lang_done','Done');
$this->t->set_var('lang_action','View');
@@ -645,7 +670,7 @@ class eq
$this->t->set_var('edit',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('lang_edit','Edit');
$this->t->set_var('cal_date',$this->db->f('date'));
-
+
// Now find out which elders participated in this activity
$sql = "SELECT * FROM eq_participation WHERE activity=" . intval(get_var('activity',array('GET','POST')));
$this->db->query($sql,__LINE__,__FILE__);
@@ -691,14 +716,14 @@ class eq
$action = get_var('action',array('GET','POST'));
$this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.act_list'));
$activity['activity'] = intval(get_var('activity',array('GET','POST')));
-
+
if($action == 'save')
{
- $activity['name'] = $this->db->db_addslashes(get_var('name',array('POST')));
+ $activity['assignment'] = $this->db->db_addslashes(get_var('assignment',array('POST')));
$activity['date'] = $this->db->db_addslashes(get_var('date',array('POST')));
$activity['notes']= $this->db->db_addslashes(get_var('notes',array('POST')));
$this->db->query("UPDATE eq_activity set " .
- " name='" . $activity['name'] .
+ " assignment='" . $activity['assignment'] .
"', date='" . $activity['date'] . "'" .
", notes='" . $activity['notes'] . "'" .
" WHERE activity=" . $activity['activity'],__LINE__,__FILE__);
@@ -720,12 +745,28 @@ class eq
if($action == 'insert')
{
- $activity['name'] = $this->db->db_addslashes(get_var('name',array('POST')));
+ $activity['assignment'] = $this->db->db_addslashes(get_var('assignment',array('POST')));
$activity['date'] = $this->db->db_addslashes(get_var('date',array('POST')));
$activity['notes']= $this->db->db_addslashes(get_var('notes',array('POST')));
- $this->db->query("INSERT INTO eq_activity (name,date,notes) "
- . "VALUES ('" . $activity['name'] . "','"
+ $this->db->query("INSERT INTO eq_activity (assignment,date,notes) "
+ . "VALUES ('" . $activity['assignment'] . "','"
. $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__);
+
+ $sql = "SELECT * FROM eq_activity WHERE assignment='".$activity['assignment']."' "
+ . " AND date='".$activity['date']."' AND notes='".$activity['notes']."'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ if($this->db->next_record()) {
+ print "activity: " . $this->db->f('activity') . "
";
+ $activity['activity'] = $this->db->f('activity');
+ }
+
+ $elders = get_var('elder_name',array('POST'));
+ foreach ($elders as $elder)
+ {
+ $this->db->query("INSERT INTO eq_participation (elder,activity) "
+ . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
+ }
+
$this->act_list();
return false;
}
@@ -734,7 +775,7 @@ class eq
{
$activity['activity'] = 0;
$this->t->set_var('cal_date',$this->jscal->input('date','','','','','','',$this->cal_options));
- $this->t->set_var('name','');
+ $this->t->set_var('assignment','');
$this->t->set_var('date','');
$this->t->set_var('notes','');
$this->t->set_var('lang_done','Cancel');
@@ -749,7 +790,8 @@ class eq
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$this->t->set_var('cal_date',$this->jscal->input('date',$this->db->f('date'),'','','','','',$this->cal_options));
- $this->t->set_var('name', $this->db->f('name'));
+ $this->t->set_var('assignment', $this->db->f('assignment'));
+ $assignment = $this->db->f('assignment');
$this->t->set_var('date', $this->db->f('date'));
$this->t->set_var('notes', $this->db->f('notes'));
$this->t->set_var('lang_done','Cancel');
@@ -759,6 +801,30 @@ class eq
}
+ // Create the assignments drop-down list
+ $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $assignments[$i]['assignment'] = $this->db->f('assignment');
+ $assignments[$i]['name'] = $this->db->f('name');
+ $assignments[$i]['code'] = $this->db->f('code');
+ $i++;
+ }
+
+ $assignment_data.= '';
+ $this->t->set_var('assignment_data',$assignment_data);
+
+ // Create elder selection boxes
$sql = "SELECT * FROM eq_elder";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
@@ -805,6 +871,125 @@ class eq
$this->save_sessiondata();
}
+ function assign_view()
+ {
+ $this->t->set_file(array('assign_view_t' => 'assign_view.tpl'));
+ $this->t->set_block('assign_view_t','assign_view','list');
+
+ $this->t->set_var('lang_name','Assignment Name');
+ $this->t->set_var('lang_code','Code');
+
+ $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $total_records = $this->db->num_rows();
+
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $assignment_list[$i]['assignment'] = $this->db->f('assignment');
+ $assignment_list[$i]['name'] = $this->db->f('name');
+ $assignment_list[$i]['code'] = $this->db->f('code');
+ $i++;
+ }
+
+ for ($i=0; $i < count($assignment_list); $i++)
+ {
+ $this->nextmatchs->template_alternate_row_color(&$this->t);
+ $this->t->set_var('name',$assignment_list[$i]['name']);
+ $this->t->set_var('code',$assignment_list[$i]['code']);
+
+ $link_data['menuaction'] = 'eq.eq.assign_update';
+ $link_data['assignment'] = $assignment_list[$i]['assignment'];
+ $link_data['action'] = 'edit';
+ $this->t->set_var('edit',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+ $this->t->set_var('lang_edit','Edit');
+
+ $link_data['menuaction'] = 'eq.eq.assign_update';
+ $link_data['assignment'] = '0';
+ $link_data['action'] = 'add';
+ $this->t->set_var('add','