X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=d6bf500688d66b88a3a558d35284e0b65ff62fea;hb=e5ddee51384dd75fd9611897ce92cb4e76e37952;hp=aa604813f5caea63353973e289acd3d4093c6bc4;hpb=0ba310089373dd8c0ddb7091c56a5b7c15c249b2;p=eq%2F.git

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index aa60481..d6bf500 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -23,6 +23,10 @@ class eq
   var $default_ppi_num_months;
   var $default_ppi_num_years;
   var $default_att_num_months;
+  var $current_year;
+  var $current_month;
+  var $upload_target_path;
+  var $script_path;
   
   var $public_functions = array
     (
@@ -38,7 +42,9 @@ class eq
      'vis_update' => True,
      'att_view'   => True,
      'att_update' => True,
-     'dir_view'   => True
+     'dir_view'   => True,
+     'org_view'   => True,
+     'admin'      => True
      );
  
   function eq()
@@ -47,6 +53,8 @@ class eq
       $this->default_ppi_num_months = 3;
       $this->default_ppi_num_years = 0;
       $this->default_att_num_months = 3;
+      $this->upload_target_path = "/home/users/eqpres/eq_data/";
+      $this->script_path = "/usr/share/phpgroupware/eq/";
       
       $this->db		= $GLOBALS['phpgw']->db;
       $this->db2	= $this->db;
@@ -64,6 +72,12 @@ class eq
        
       $GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools';
       $GLOBALS['phpgw']->common->phpgw_header();
+      
+      $this->current_month = `date '+%m'`;
+      $this->current_month = $this->current_month-0; // Make it numeric
+      $this->current_year = `date '+%Y'`;
+      $this->current_year = $this->current_year-0; // Make it numeric
+
       echo parse_navbar();
       $this->display_app_header();	
     }
@@ -109,6 +123,12 @@ class eq
       $link_data['menuaction'] = 'eq.eq.dir_view';	
       $this->t->set_var('link_dir',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
       $this->t->set_var('lang_dir','Directory');
+      $link_data['menuaction'] = 'eq.eq.org_view';	
+      $this->t->set_var('link_org',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+      $this->t->set_var('lang_org','Callings');
+      $link_data['menuaction'] = 'eq.eq.admin';	
+      $this->t->set_var('link_admin',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+      $this->t->set_var('lang_admin','Admin');
 		
       $this->t->pparse('out','eq_header');
     }
@@ -128,7 +148,7 @@ class eq
       
       $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ht_view'));
       $this->t->set_var('title','Hometeaching'); 
-
+      
       $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
@@ -230,10 +250,14 @@ class eq
 	      // in the past $num_months for this Family
 	      $header_row="<th width=$comp_width><font size=-2>Families</th>";
 	      for($m=$num_months; $m >= 0; $m--) {
-		if(`date '+%d'` == 31) { $d = 1; } else { $d = 0; }
-		$month = date('m/Y', strtotime('-'.$m.' month -'.$d.' day'));
-		$month_start = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_start .= "-01";
-		$month_end = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_end .= "-31";
+		$month = $this->current_month - $m;
+		$year = $this->current_year;
+		if($month <= 0) { $remainder = $month; $month = 12 + $remainder; $year=$year-1; }
+		if($month < 10) { $month = "0"."$month"; }
+		$month_start = "$year"."-"."$month"."-"."01";
+		$month_end = "$year"."-"."$month"."-"."31";
+		$month = "$month"."/"."$year";
+		//print "m: $m month: $month year: $year month_start: $month_start month_end: $month_end<br>";
 		// Add this to the query to filter on only visits made by this companionship:
 		// " AND companionship=" . $unique_companionships[$j]['companionship'].
 		$sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
@@ -863,10 +887,16 @@ class eq
       $i=0;
       while ($this->db->next_record())
 	{
-	  $districts[$i]['district'] = $this->db->f('district');
-	  $districts[$i]['name'] = $this->db->f('name');
-	  $districts[$i]['supervisor'] = $this->db->f('supervisor');
-	  if($eqpresppi == 0) { $i++; }
+	  if($eqpresppi == 1 && $this->db->f('district') == 1) {
+	    $districts[$i]['district'] = $this->db->f('district');
+	    $districts[$i]['name'] = $this->db->f('name');
+	    $districts[$i]['supervisor'] = $this->db->f('supervisor');
+          } else if($eqpresppi == 0) {
+            $districts[$i]['district'] = $this->db->f('district');
+	    $districts[$i]['name'] = $this->db->f('name');
+            $districts[$i]['supervisor'] = $this->db->f('supervisor');
+            $i++;
+	  }
 	}
 
       $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
@@ -978,10 +1008,13 @@ class eq
 		  $header_row .= "<th width=150><font size=-2>$year</th>"; 
 	        }
 	        else {
-		  if(`date '+%d'` == 31) { $d = 1; } else { $d = 0; }
-		  $month = date('m/Y', strtotime('-'.$m.' month -'.$d.' day'));
-		  $month_start = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_start .= "-01";
-		  $month_end = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_end .= "-31";
+		  $month = $this->current_month - $m;
+		  $year = $this->current_year;
+		  if($month <= 0) { $remainder = $month; $month = 12 + $remainder; $year=$year-1; }
+		  if($month < 10) { $month = "0"."$month"; }
+		  $month_start = "$year"."-"."$month"."-"."01";
+		  $month_end = "$year"."-"."$month"."-"."31";
+		  $month = "$month"."/"."$year";
 		  $sql = "SELECT * FROM eq_ppi WHERE date >= '$month_start' AND date <= '$month_end' ".
 		         "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id . " AND eqpresppi=0";
 		  $this->db2->query($sql,__LINE__,__FILE__);
@@ -1761,6 +1794,189 @@ class eq
       $this->save_sessiondata();   
     }
   
+  function org_view()
+    {
+      $this->t->set_file(array('org_view_t' => 'org_view.tpl'));
+      $this->t->set_block('org_view_t','calling_list','list1');
+      $this->t->set_block('org_view_t','org_list','list2');
+
+      # Display a list ordered alphabetically
+      $sql = "SELECT * FROM eq_calling ORDER BY name ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while ($this->db->next_record())
+      	{
+	  $calling[$i]['id'] = $this->db->f('indiv_id');
+	  $calling[$i]['name'] = $this->db->f('name');
+	  $calling[$i]['position'] = $this->db->f('position');
+	  $calling[$i]['sustained'] = $this->db->f('sustained');
+	  $calling[$i]['organization'] = $this->db->f('organization');
+	  $i++;
+	}   
+      for ($i=0; $i < count($calling); $i++) 
+      {
+        $name = $calling[$i]['name'];
+	$position = $calling[$i]['position'];
+	$sustained = $calling[$i]['sustained'];
+	$organization = $calling[$i]['organization'];
+	$this->t->set_var('name', $name);
+	$this->t->set_var('position', $position);
+	$this->t->set_var('sustained', $sustained);
+	$this->t->set_var('organization', $organization);
+        $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+        $this->t->set_var('tr_color',$tr_color);
+	$this->t->fp('list1','calling_list',True);
+      }
+
+      # Display a list ordered by organization
+      $sql = "SELECT * FROM eq_calling ORDER BY sequence ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while ($this->db->next_record())
+      	{
+	  $calling[$i]['id'] = $this->db->f('indiv_id');
+	  $calling[$i]['name'] = $this->db->f('name');
+	  $calling[$i]['position'] = $this->db->f('position');
+	  $calling[$i]['sustained'] = $this->db->f('sustained');
+	  $calling[$i]['organization'] = $this->db->f('organization');
+	  $i++;
+	}   
+      for ($i=0; $i < count($calling); $i++) 
+      {
+        $name = $calling[$i]['name'];
+	$position = $calling[$i]['position'];
+	$sustained = $calling[$i]['sustained'];
+	$organization = $calling[$i]['organization'];
+	$this->t->set_var('name', $name);
+	$this->t->set_var('position', $position);
+	$this->t->set_var('sustained', $sustained);
+	$this->t->set_var('organization', $organization);
+        $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+        $this->t->set_var('tr_color',$tr_color);
+	$this->t->fp('list2','org_list',True);
+      }
+      
+      $this->t->pfp('out','org_view_t');
+      $this->save_sessiondata();   
+    }
+
+  function admin()
+    {
+      $this->t->set_file(array('admin_t' => 'admin.tpl'));
+      $this->t->set_block('admin_t','upload','uploadhandle');
+      $this->t->set_block('admin_t','admin','adminhandle');
+      $this->t->set_block('admin_t','cmd','cmdhandle');
+      
+      $this->t->set_var('upload_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.admin&action=upload'));
+      
+      $action = get_var('action',array('GET','POST'));
+
+      $this->t->pfp('out','admin_t');
+      
+      if($action == 'upload')
+	{	 
+	  $target_path = $this->upload_target_path . basename( $_FILES['uploadedfile']['name']);
+	  
+	  if(($_FILES['uploadedfile']['type'] == "application/zip") &&
+	     (move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $target_path))) {
+	    $uploadstatus = "<b>The following file was uploaded successfully: </b><br><br>";
+	    $uploadstatus.= "Filename : " . $_FILES['uploadedfile']['name'] . "<br>";
+	    $uploadstatus.= "Type     : " . $_FILES['uploadedfile']['type'] . "<br>";
+	    $uploadstatus.= "Size     : " . $_FILES['uploadedfile']['size'] . "<br>";	 
+	    $this->t->set_var('uploadstatus',$uploadstatus);
+	    $this->t->pfp('uploadhandle','upload');
+	    $this->t->set_var('uploadhandle','');
+	    print "<table border=1 width=80%><tr><td>\n<pre>";
+	    
+	    # make a directory for this data to be stored in
+	    $date="data_" . date("Y_m_d");
+	    $data_dir = $this->upload_target_path . $date;
+	    print "-> Making the data directory: $date<br>\n";
+	    exec('mkdir ' . $data_dir . ' 2>&1', $result, $return_code);
+	    if($return_code != 0) {
+	      print implode('\n',$result) . "<br>";
+	      print "<b><font color=red>";
+	      print "-E- Unable to create the data directory. Aborting import.";
+	      print "</font></b>";
+	      return 0;
+	    }
+
+	    # move the file uploaded into this directory
+	    print "-> Moving the uploaded file into the data dir<br>\n";
+	    exec('mv ' . $target_path . ' ' . $data_dir . '/' . ' 2>&1', $result, $return_code);
+	    if($return_code != 0) {
+	      print implode('\n',$result) . "<br>";
+	      print "<b><font color=red>";
+	      print "-E- Unable to move the uploaded file into the data dir. Aborting import.";
+	      print "</font></b>";
+	      return 0;
+	    }
+	    
+	    # unzip the data into this directory
+	    print "-> Unzipping the data<br>\n";
+	    $data_file = $data_dir . '';
+	    exec('unzip ' . $data_dir . '/*.zip -d ' . $data_dir . ' 2>&1', $result, $return_code);
+	    if($return_code != 0) {
+	      print implode('\n',$result) . "<br>";
+	      print "<b><font color=red>";
+	      print "-E- Unable to unzip the uploaded file into the data dir. Aborting import.";
+	      print "</font></b>";
+	      return 0;
+	    }
+	    exec('mv ' . $data_dir . '/*/* '. $data_dir . ' 2>&1', $result, $return_code);
+
+	    # update the data_latest link to point to this new directory
+	    print "-> Updating the latest data dir link<br>\n";
+	    $data_latest = $this->upload_target_path . 'data_latest';
+	    exec('rm ' . $data_latest. '; ln -s ' . $data_dir .' '. $data_latest .' 2>&1', $result, $return_code);
+	    if($return_code != 0) {
+	      print implode('\n',$result) . "<br>";
+	      print "<b><font color=red>";
+	      print "-E- Unable to update the data latest link. Aborting import.";
+	      print "</font></b>";
+	      return 0;
+	    }
+	    
+	    # run the import perl script to encorporate it into the DB
+	    ob_start('ob_logstdout', 2);
+	    print "-> Importing the data into the EQ database<br>\n";
+	    ob_flush(); flush(); sleep(1);
+	    $import_log = $this->upload_target_path . '/import.log';
+	    $data_log = $this->upload_target_path . '/data.log';
+	    $import_cmd = $this->script_path . 'import_ward_data ' . $data_latest . ' | tee ' . $import_log;
+	    $parse_cmd = $this->script_path . 'parse_ward_data -v ' . $data_latest . ' > ' . $data_log;
+	    #print "import_cmd: $import_cmd<br>";
+	    #print "parse_cmd: $parse_cmd<br>";
+	    ob_start('ob_logstdout', 2);
+	    passthru($import_cmd);
+	    passthru($parse_cmd);
+	    ob_flush(); flush(); sleep(1);
+
+	    # fix the permissions of the data dir
+	    exec('chmod -R o-rwx ' . $data_dir, $result, $return_code);
+	    
+	    $this->t->pfp('cmdhandle','cmd');
+	    print "</pre></td></tr></table>";
+	    
+	  } else if($_FILES['uploadedfile']['type'] != "application/zip") {
+	    $uploadstatus = "<b><font color=red>The file format must be a .zip file, please try again! </font></b>";
+	    $this->t->set_var('uploadstatus',$uploadstatus);
+	    
+	  } else {
+	    $uploadstatus = "<b><font color=red> There was an error (" . $_FILES['uploadedfile']['error'];
+	    $uploadstatus.= ") uploading the file, please try again! </font></b>";
+	    $this->t->set_var('uploadstatus',$uploadstatus);
+	  }
+	}
+      else
+	{
+	  $this->t->set_var('adminhandle','');
+	  $this->t->pfp('adminhandle','admin'); 
+	}
+      
+      $this->save_sessiondata();   
+    }
+  
 }
 
 ?>