Parcourir la source

added create/update dates in Przypomnij tasks

Piotr Labudda il y a 10 ans
Parent
commit
66f5b375c3
1 fichiers modifiés avec 31 ajouts et 1 suppressions
  1. 31 1
      SE/se-lib/Przypomnij.php

+ 31 - 1
SE/se-lib/Przypomnij.php

@@ -66,6 +66,8 @@ class Przypomnij {
 				, kor.L_APPOITMENT_INFO
 				, kor.A_RECORD_CREATE_DATE
 				, kor.A_RECORD_CREATE_AUTHOR
+				, kor.A_RECORD_UPDATE_DATE
+				, kor.A_RECORD_UPDATE_AUTHOR
 				, kor.K_TYP_KORESP, kor.K_TYP_RODZAJ
 				-- ? , kor.K_TYP_RODZAJ_OPIS
 				, kor.K_OD_KOGO
@@ -80,6 +82,8 @@ class Przypomnij {
 		";
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
+			$r->A_RECORD_CREATE_DATE = $this->fixDateFormat($r->A_RECORD_CREATE_DATE);
+			$r->A_RECORD_UPDATE_DATE = $this->fixDateFormat($r->A_RECORD_UPDATE_DATE);
 			$r->_task_type = 'koresp';
 			$r->_show = false;
 			$r->_acl_proj_id = (int)$r->ID_PROJECT;
@@ -106,6 +110,8 @@ class Przypomnij {
 				, proj.L_APPOITMENT_INFO
 				, proj.A_RECORD_CREATE_DATE
 				, proj.A_RECORD_CREATE_AUTHOR
+				, proj.A_RECORD_UPDATE_DATE
+				, proj.A_RECORD_UPDATE_AUTHOR
 				, proj.M_DISTRIBUTOR
 				-- ? , proj.M_DIST_DATE
 				-- ? , proj.A_RECORD_CREATE_AUTHOR, proj.A_RECORD_UPDATE_AUTHOR, proj.A_RECORD_UPDATE_DATE
@@ -116,6 +122,8 @@ class Przypomnij {
 		";
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
+			$r->A_RECORD_CREATE_DATE = $this->fixDateFormat($r->A_RECORD_CREATE_DATE);
+			$r->A_RECORD_UPDATE_DATE = $this->fixDateFormat($r->A_RECORD_UPDATE_DATE);
 			$r->M_DIST_DESC = htmlspecialchars($r->M_DIST_DESC);// TODO: fix bug in html a href inside M_DIST_DESC
 			$r->_task_type = 'projekt';
 			$r->_show = false;
@@ -140,6 +148,10 @@ class Przypomnij {
 				, p.`L_APPOITMENT_DATE`
 				, p.`L_APPOITMENT_USER`
 				, p.`L_APPOITMENT_INFO`
+				, p.A_RECORD_CREATE_DATE
+				, p.A_RECORD_CREATE_AUTHOR
+				, p.A_RECORD_UPDATE_DATE
+				, p.A_RECORD_UPDATE_AUTHOR
 			from `CRM_PROCES` as p
 			where p.`A_STATUS` in('NORMAL', 'WAITING')
 				and p.`TYPE`='PROCES_INIT'
@@ -149,6 +161,8 @@ class Przypomnij {
 		";
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
+			$r->A_RECORD_CREATE_DATE = $this->fixDateFormat($r->A_RECORD_CREATE_DATE);
+			$r->A_RECORD_UPDATE_DATE = $this->fixDateFormat($r->A_RECORD_UPDATE_DATE);
 			$r->_task_type = 'proces';
 			$r->_show = false;
 			$r->_title = $r->DESC;
@@ -172,9 +186,10 @@ class Przypomnij {
 				, probl.L_APPOITMENT_INFO
 				, probl.A_RECORD_CREATE_DATE
 				, probl.A_RECORD_CREATE_AUTHOR
+				, probl.A_RECORD_UPDATE_DATE
+				, probl.A_RECORD_UPDATE_AUTHOR
 				, probl.A_PROBLEM
 				, probl.A_PROBLEM_DESC
-
 			from `PROBLEMS` as probl
 			where probl.`A_STATUS` NOT IN ('OFF_HARD','DELETED')
 				and probl.`L_APPOITMENT_DATE`!=''
@@ -183,6 +198,8 @@ class Przypomnij {
 		";
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
+			$r->A_RECORD_CREATE_DATE = $this->fixDateFormat($r->A_RECORD_CREATE_DATE);
+			$r->A_RECORD_UPDATE_DATE = $this->fixDateFormat($r->A_RECORD_UPDATE_DATE);
 			$r->A_PROBLEM_DESC = htmlspecialchars($r->A_PROBLEM_DESC);
 			$r->_task_type = 'task';
 			$r->_show = false;
@@ -206,6 +223,10 @@ class Przypomnij {
 				, p.`L_APPOITMENT_DATE`
 				, p.`L_APPOITMENT_USER`
 				, p.`L_APPOITMENT_INFO`
+				, p.A_RECORD_CREATE_DATE
+				, p.A_RECORD_CREATE_AUTHOR
+				, p.A_RECORD_UPDATE_DATE
+				, p.A_RECORD_UPDATE_AUTHOR
 			from `CRM_LISTA_ZASOBOW` as p
 			where p.`A_STATUS` in('NORMAL', 'WAITING')
 				and p.`L_APPOITMENT_DATE`!=''
@@ -214,6 +235,8 @@ class Przypomnij {
 		";
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
+			$r->A_RECORD_CREATE_DATE = $this->fixDateFormat($r->A_RECORD_CREATE_DATE);
+			$r->A_RECORD_UPDATE_DATE = $this->fixDateFormat($r->A_RECORD_UPDATE_DATE);
 			$r->_task_type = 'zasob';
 			$r->_show = false;
 			$r->_title = $r->DESC;
@@ -226,6 +249,13 @@ class Przypomnij {
 		$this->_fetchLAppUsers();
 	}
 
+	public function fixDateFormat($date) {// fix date format '2013-12-04-09:30' => '2013-12-04 09:30'
+		if (!empty($date) && '-' == substr($date, 10, 1)) {
+			$date = substr($date, 0, 10) . ' ' . substr($date, 11);
+		}
+		return $date;
+	}
+
 	public function setFltrUser($userName) {
 		foreach ($this->_data as $kType => $vTasks) {
 			foreach ($vTasks as $kId => $vTask) {