浏览代码

Graph View add missing methods in ProcesHelper

Piotr Labudda 11 年之前
父节点
当前提交
bfb5285f93
共有 3 个文件被更改,包括 47 次插入7 次删除
  1. 1 1
      SE/VERSION
  2. 43 2
      SE/se-lib/ProcesHelper.php
  3. 3 4
      SE/superedit-GRAPH_VIEW_PROCES.php

+ 1 - 1
SE/VERSION

@@ -1 +1 @@
-3.9.9-8
+3.9.9-9

+ 43 - 2
SE/se-lib/ProcesHelper.php

@@ -201,6 +201,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk: ';pr
 	 * @param $stanowiska_id - array of integer
 	 * @param $stanowiska_id - array of integer
 	 */
 	 */
 	public static function get_procesy_by_stanowiska( $stanowiska_id = array() ) {
 	public static function get_procesy_by_stanowiska( $stanowiska_id = array() ) {
+		$db = DB::getDB();
 		$ret = array();
 		$ret = array();
 		if (empty($stanowiska_id)) {
 		if (empty($stanowiska_id)) {
 			return $ret;
 			return $ret;
@@ -237,8 +238,8 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk: ';pr
 				and z.`ID` in (" . implode(",", $sql_stanowiska_id) . ")
 				and z.`ID` in (" . implode(",", $sql_stanowiska_id) . ")
 			order by p.`TEST_SORT_PRIO` DESC, p.`ID` ASC
 			order by p.`TEST_SORT_PRIO` DESC, p.`ID` ASC
 		";
 		";
-		$res = DB::query($sql);
-		while ($r = DB::fetch($res)) {
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
 			$ret []= $r;
 			$ret []= $r;
 		}
 		}
 		return $ret;
 		return $ret;
@@ -418,6 +419,28 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk: ';pr
 		return DB::get_by_id('CRM_PROCES', $next_id);
 		return DB::get_by_id('CRM_PROCES', $next_id);
 	}
 	}
 
 
+	public static function get_proces_init_by_zasob_id($id_zasob) {
+		$db = DB::getDB();
+		$sqlFilter = " cw.ID_ZASOB={$id_zasob}";
+		if (is_array($id_zasob)) {
+			$sqlFilter = " cw.ID_ZASOB in ".implode(',', $id_zasob);
+		}
+		$sql = "select
+				cps.ID_PROCES_INIT
+				, cw.ID_PROCES
+			from CRM_WSKAZNIK as cw
+				left join _CRM_PROCES_STATS_proc_wiev as cps on(cps.ID = cw.ID_PROCES)
+			where cw.A_STATUS in('NORMAL', 'WAITING')
+				and cps.ID_PROCES_INIT > 0 and
+				{$sqlFilter}
+		";
+		$res = $db->query($sql);
+		while ($h = $db->fetch($res)) {
+			$ret[] = $h->ID_PROCES_INIT;
+		}
+		return $ret;
+	}
+
 	public static function getZasobTableInfo($zasobID) {
 	public static function getZasobTableInfo($zasobID) {
 		$zasobObj = null;
 		$zasobObj = null;
 		$db = DB::getDB();
 		$db = DB::getDB();
@@ -435,6 +458,24 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk: ';pr
 		return $zasobObj;
 		return $zasobObj;
 	}
 	}
 
 
+	public static function getZasobInfo($zasobID) {
+		$zasobObj = null;
+		$db = DB::getDB();
+		$sql = "select z.`ID`, z.`DESC`, z.`DESC_PL`, z.`OPIS`, z.`TYPE`
+				, zp.`ID` as P__ID
+				, zp.`DESC` as P__DESC
+				, zp.`TYPE` as P__TYPE
+			from `CRM_LISTA_ZASOBOW` as z
+				left join `CRM_LISTA_ZASOBOW` as zp on(zp.`ID`=z.`PARENT_ID`)
+			where z.`ID`='{$zasobID}'
+		";
+		$res = $db->query($sql);
+		if ($res) {
+			$zasobObj = $db->fetch($res);
+		}
+		return $zasobObj;
+	}
+
 	public static function getZasobTableID($tblName) {
 	public static function getZasobTableID($tblName) {
 		$zasobID = 0;
 		$zasobID = 0;
 		$db = DB::getDB();
 		$db = DB::getDB();

+ 3 - 4
SE/superedit-GRAPH_VIEW_PROCES.php

@@ -1,5 +1,8 @@
 <?php
 <?php
 
 
+Lib::loadClass('ProcesHelper');
+Lib::loadClass('UsersHelper');
+
 function GRAPH_VIEW_PROCES() {
 function GRAPH_VIEW_PROCES() {
 	$id_proces = V::get('id_proces', '', $_REQUEST, 'int');
 	$id_proces = V::get('id_proces', '', $_REQUEST, 'int');
 	$id_zasob = V::get('id_zasob', '', $_REQUEST, 'int');
 	$id_zasob = V::get('id_zasob', '', $_REQUEST, 'int');
@@ -44,7 +47,6 @@ function GRAPH_VIEW_PROCES() {
 		else {//zasob
 		else {//zasob
 			$id = V::get('id', 0, $_REQUEST);
 			$id = V::get('id', 0, $_REQUEST);
 			if ($id[0] == 'Z') {
 			if ($id[0] == 'Z') {
-				Lib::loadClass('ProcesHelper');
 				$zasob = ProcesHelper::getZasobInfo(4975);
 				$zasob = ProcesHelper::getZasobInfo(4975);
 				echo "Zasob: [".$zasob->ID."], Typ: ".$zasob->TYPE.", Nazwa: ".$zasob->DESC." (".$zasob->DESC_PL.")<br>".$zasob->OPIS;
 				echo "Zasob: [".$zasob->ID."], Typ: ".$zasob->TYPE.", Nazwa: ".$zasob->DESC." (".$zasob->DESC_PL.")<br>".$zasob->OPIS;
 				echo "<hr> Nadrzędny: Zasob: [".$zasob->P__ID."] , Typ: ".$zasob->P__TYPE.", Nazwa: ".$zasob->P__DESC." (".$zasob->P__DESC_PL.")<br>".$zasob->P__OPIS;
 				echo "<hr> Nadrzędny: Zasob: [".$zasob->P__ID."] , Typ: ".$zasob->P__TYPE.", Nazwa: ".$zasob->P__DESC." (".$zasob->P__DESC_PL.")<br>".$zasob->P__OPIS;
@@ -99,20 +101,17 @@ function GRAPH_VIEW_PROCES() {
 		$PROCES_INIT_SCAN_USER = V::get('PROCES_INIT_SCAN_USER', '', $_REQUEST, 'int');
 		$PROCES_INIT_SCAN_USER = V::get('PROCES_INIT_SCAN_USER', '', $_REQUEST, 'int');
 
 
 		if (!empty($PROCES_INIT_SCAN_STANOWISKO)) {
 		if (!empty($PROCES_INIT_SCAN_STANOWISKO)) {
-			Lib::loadClass('ProcesHelper');
 			$PROCES_INIT_SCAN_STANOWISKA = array($PROCES_INIT_SCAN_STANOWISKO);
 			$PROCES_INIT_SCAN_STANOWISKA = array($PROCES_INIT_SCAN_STANOWISKO);
 			$proces_list_obj = ProcesHelper::get_procesy_by_stanowiska($PROCES_INIT_SCAN_STANOWISKA);
 			$proces_list_obj = ProcesHelper::get_procesy_by_stanowiska($PROCES_INIT_SCAN_STANOWISKA);
 			foreach ($proces_list_obj as $obj) {
 			foreach ($proces_list_obj as $obj) {
 				$init[$obj->ID] = $obj->ID;
 				$init[$obj->ID] = $obj->ID;
 			}
 			}
 		} else if(!empty($PROCES_INIT_SCAN_USER))  {
 		} else if(!empty($PROCES_INIT_SCAN_USER))  {
-			Lib::loadClass('UsersHelper');
 			$proces_list_obj = UsersHelper::get_group_by_user($PROCES_INIT_SCAN_USER, array('SHOW_IN_PERIOD_MARK' => 'YES'));
 			$proces_list_obj = UsersHelper::get_group_by_user($PROCES_INIT_SCAN_USER, array('SHOW_IN_PERIOD_MARK' => 'YES'));
 			foreach ($proces_list_obj as $obj) {
 			foreach ($proces_list_obj as $obj) {
 				$init[$obj->ID] = $obj->ID;
 				$init[$obj->ID] = $obj->ID;
 			}
 			}
 		} else if(!empty($id_zasob)) {
 		} else if(!empty($id_zasob)) {
-			Lib::LoadClass('ProcesHelper');
 			$init = ProcesHelper::get_proces_init_by_zasob_id($id_zasob);
 			$init = ProcesHelper::get_proces_init_by_zasob_id($id_zasob);
 		} else {
 		} else {
 			$init = $cp->get_proces_init($id_proces);
 			$init = $cp->get_proces_init($id_proces);