Merge branch 'master' of biuro.biall-net.pl:plabudda/se

SE/se-lib/Przypomnij.php

@@ -148,7 +148,46 @@ class Przypomnij {
 			$r->_l_app_date = $r->L_APPOITMENT_DATE;
 			$this->_data['proces'][$r->ID] = $r;
 		}
+		
+		/* @2015-09-20 todo - powiazac akcje na superedit-PRZYPOMNIJ.php - nie jest latwo - bindera
+		
+				$sqlAclFltrProblems = "
+			and (probl.`A_ADM_COMPANY` in({$sqlUsrAclGroups})
+					or probl.`A_CLASSIFIED` in({$sqlUsrAclGroups})
+					or probl.`L_APPOITMENT_USER`='{$userLogin}'
+					)
+		";
+		$sql = "select probl.ID
+				, probl.PARENT_ID
+				, probl.A_STATUS
+				, probl.L_APPOITMENT_DATE
+				, probl.L_APPOITMENT_USER
+				, probl.L_APPOITMENT_INFO
+				, probl.A_RECORD_CREATE_DATE
+				, probl.A_RECORD_CREATE_AUTHOR
+				, probl.A_PROBLEM
+				, probl.A_PROBLEM_DESC
+
+			from `PROBLEMS` as probl
+			where probl.`A_STATUS` NOT IN ('OFF_HARD','DELETED')
+				{$sqlAclFltrProblems}
+		";
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			$r->M_DIST_DESC = htmlspecialchars($r->M_DIST_DESC);// TODO: fix bug in html a href inside M_DIST_DESC
+			$r->_task_type = 'problem';
+			$r->_show = false;
+			$r->_acl_proj_id = (int)$r->P_ID;
+			$r->_title = $r->M_DIST_DESC;
+			$r->_type = $r->M_DIST_TYPE;
+			$r->_l_app = $r->L_APPOITMENT_USER;
+			$r->_l_app_date = $r->L_APPOITMENT_DATE;
+			$this->_data['problem'][$r->ID] = $r;
+		}
 
+		*/
+		
+		
 		$this->_fetchLAppUsers();
 	}
 
@@ -345,6 +384,8 @@ if(V::get('DBG_P', '', $_GET) > 2){echo'<pre style="max-height:200px;overflow:au
 		$tblsToSearch[] = 'IN7_DZIENNIK_KORESP';
 		$tblsToSearch[] = 'CRM_PROCES';
 		$tblsToSearch[] = 'CRM_LISTA_ZASOBOW';
+		$tblsToSearch[] = 'PROBLEMS';
+
 
 		$userAcl = User::getAcl();
 		foreach ($tblsToSearch as $tblName) {

SE/superedit-PRZYPOMNIJ.php

@@ -335,7 +335,7 @@ if(V::get('DBG_P', '', $_GET)){echo'<pre style="max-height:200px;overflow:auto;b
 $ILOSC_PISM = 0;
 $ILOSC_SPRAW = 0;
 $ILOSC_PROCES = 0;
-
+$ILOSC_ZADAN = 0;
 /*
  * Tabela tasków:
  * -- termin wykonania
@@ -381,6 +381,8 @@ $usrGroupNames = User::getLdapGroupsNames();
 					$ILOSC_PISM += 1;
 				} else if ($task->_task_type == 'proces') {
 					$ILOSC_PROCES += 1;
+				} else if ($task->_task_type == 'problem') {
+					$ILOSC_ZADAN += 1;
 				}
 
 				$clsData = $przypomnij->getTaskDateFltrType($task->_l_app_date);
@@ -433,6 +435,8 @@ $usrGroupNames = User::getLdapGroupsNames();
 Ilość pism: <span id="przypomnij_stats-pisma"><?php echo $ILOSC_PISM; ?></span>,
 	ilość spraw: <span id="przypomnij_stats-projekty"><?php echo $ILOSC_SPRAW; ?></span>,
 	ilość procesów: <span id="przypomnij_stats-procesy"><?php echo $ILOSC_PROCES; ?></span>.
+	<?php //ilość zadań: <span id="przypomnij_stats-procesy">//<//?// php echo $ILOSC_ZADAN; //?//></span>. ?>
+
 </div>
 
 <div class="przypomnijInlineEditBox inlineEditBox modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">