X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;ds=inline;f=inc%2Fclass.eq.inc.php;h=328b1ab47fc75869b61cdffb2a98c073a631d945;hb=759d76b818ce63f221215f8521b246fd61ab3976;hp=32f824585502991769491f2e19841ef45a616e0b;hpb=4800cbc5c11e33d6f32ea72c80c07a71ab02c158;p=eq%2F.git diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index 32f8245..328b1ab 100644 --- a/inc/class.eq.inc.php +++ b/inc/class.eq.inc.php @@ -660,15 +660,15 @@ class eq $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.act_update'; - $link_data['activity'] = '0'; - $link_data['action'] = 'add'; - $this->t->set_var('add','
'); - $this->t->fp('list','act_list',True); } + $link_data['menuaction'] = 'eq.eq.act_update'; + $link_data['activity'] = '0'; + $link_data['action'] = 'add'; + $this->t->set_var('add',''); + $this->t->pfp('out','act_list_t'); $this->save_sessiondata(); } @@ -772,12 +772,14 @@ class eq // Re-add the elders who are checked as having participated in this 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__); - } - + if(is_array($elders)) { // Only do the foreach loop if we have a valid array of elders to work with + foreach ($elders as $elder) + { + $this->db->query("INSERT INTO eq_participation (elder,activity) " + . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__); + } + } + $this->act_list(); return false; } @@ -1599,7 +1601,7 @@ class eq $this->db2->query($sql,__LINE__,__FILE__); if(!$this->db2->next_record()) { - $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " ORDER BY date DESC"; + $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " AND eqpresppi=1 ORDER BY date DESC"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; } $link_data['menuaction'] = 'eq.eq.ppi_update'; @@ -2552,15 +2554,22 @@ class eq $date = get_var('date',array('GET','POST')); $notes = get_var('notes',array('GET','POST')); $eqpresppi = get_var('eqpresppi',array('GET','POST')); - - $sql = "SELECT * FROM eq_elder WHERE elder=" . $interviewer; + + $sql = "SELECT * FROM eq_presidency where valid=1 and (president=1 or counselor=1 or secretary=1)"; $this->db2->query($sql,__LINE__,__FILE__); - $this->db2->next_record(); - $interviewer_name = $this->db2->f('name'); - $this->t->set_var('interviewer',$interviewer . ' selected'); - $this->t->set_var('interviewer_name',$interviewer_name); - $this->t->set_var('eqpresppi_checked',''); - $this->t->fp('int_list','interviewer_list',True); + while ($this->db2->next_record()) + { + $elder = $this->db2->f('elder'); + $interviewer_name = $this->db2->f('name'); + if($elder == $interviewer) { + $this->t->set_var('interviewer',$interviewer . ' selected'); + } else { + $this->t->set_var('interviewer',$interviewer); + } + $this->t->set_var('interviewer_name',$interviewer_name); + $this->t->set_var('eqpresppi_checked',''); + $this->t->fp('int_list','interviewer_list',True); + } if($action == 'save') { @@ -2884,25 +2893,21 @@ class eq $date = get_var('date',array('GET','POST')); $notes = get_var('notes',array('GET','POST')); $eqpresppi = get_var('eqpresppi',array('GET','POST')); - - $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC"; - $this->db->query($sql,__LINE__,__FILE__); - while ($this->db->next_record()) - { - $supervisor = $this->db->f('supervisor'); - $sql = "SELECT * FROM eq_elder WHERE elder=" . $supervisor; - $this->db2->query($sql,__LINE__,__FILE__); - $this->db2->next_record(); - $interviewer_name = $this->db2->f('name'); - - if($supervisor == $interviewer) { - $this->t->set_var('interviewer',$supervisor . ' selected'); - } else { - $this->t->set_var('interviewer',$interviewer); - } - $this->t->set_var('interviewer_name',$interviewer_name); - $this->t->fp('int_list','interviewer_list',True); - } + + $sql = "SELECT * FROM eq_presidency where valid=1 and (president=1 or counselor=1 or secretary=1 or district!=0)"; + $this->db2->query($sql,__LINE__,__FILE__); + while ($this->db2->next_record()) + { + $elder = $this->db2->f('elder'); + $interviewer_name = $this->db2->f('name'); + if($elder == $interviewer) { + $this->t->set_var('interviewer',$interviewer . ' selected'); + } else { + $this->t->set_var('interviewer',$interviewer); + } + $this->t->set_var('interviewer_name',$interviewer_name); + $this->t->fp('int_list','interviewer_list',True); + } if($action == 'save') { @@ -3649,7 +3654,7 @@ class eq $this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched')); $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs'); - $date_width=150; $time_width=225; $elder_width=200; $family_width=200; $location_width=100; + $date_width=150; $time_width=220; $elder_width=170; $family_width=180; $location_width=100; $table_width=$date_width + $time_width + $elder_width + $family_width + $location_width; $header_row = "