瀏覽代碼

widzenie zasobow np. kuwet przy widoku procesu z zasobami, szybkie dodanie urzadzenia do waitinga na podstawie widoku drzewa zasobow

a.binder 11 年之前
父節點
當前提交
aa34334b42
共有 4 個文件被更改,包括 5 次插入3 次删除
  1. 2 0
      SE/procesy/ajax.php
  2. 1 1
      SE/procesy5.php
  3. 1 1
      SE/superedit-DB_PROCEDURES_CREATE.php
  4. 1 1
      SE/superedit-GRAPH_VIEW_PROCES.php

+ 2 - 0
SE/procesy/ajax.php

@@ -295,6 +295,8 @@ if($DBG){ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;t
 	echo '<span>';
 		echo $out_link;
 		echo " ";
+		echo App::link("dodaj", "index.php?MENU_INIT=VIEWTABLE_AJAX&ZASOB_ID=".ProcesHelper::getZasobTableID('DEVICES')."&ff_A_STATUS=WAITING&ff_T_DEVICE_SERIAL=".date('Y-m-d')."-".$zasob->ID."&ff_T_DEVICE_INFO=".urlencode($zasob->OPIS)."&ff_T_DEVICE_TYPE=".urlencode($zasob->DESC)."&ff_CRM_LISTA_ZASOBOW_ID=".$zasob->ID."#CREATE", array('class'=>'btn-p5', 'title'=>'Dodaj zapotrzebowanie', 'onclick'=>null));
+		echo App::link("szukaj", "index.php?MENU_INIT=VIEWTABLE_AJAX&ZASOB_ID=".ProcesHelper::getZasobTableID('DEVICES')."&ff_CRM_LISTA_ZASOBOW_ID=".$zasob->ID, array('class'=>'btn-p5', 'title'=>'szukaj', 'onclick'=>null));
 		echo App::link_ajax("refresh", "ajax_zasob_search_external_ids", array('zasob_id'=>$zasob->ID), array('js_result_type'=>'override_parent', 'js_result'=>'', 'title'=>'refresh IDS', 'ico'=>"refresh.png"));
 	echo '</span>';
 

+ 1 - 1
SE/procesy5.php

@@ -2741,7 +2741,7 @@ function tree_callback__show_item_from_CRM_LISTA_ZASOBOW( &$r, &$tree ) {
 			}
 		}
 	}
-
+	
 	echo'</dt>';
 	echo'</dl>'."\n";
 }

+ 1 - 1
SE/superedit-DB_PROCEDURES_CREATE.php

@@ -50,7 +50,7 @@ $sql['turn_off_database_locking']="SET SESSION TRANSACTION ISOLATION LEVEL READ
 
 
 $sql['KONTAKTY_view']="
-CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `KONTAKTY_view` AS select `u`.`ID` AS `ID`,`u`.`ADM_ACCOUNT` AS `ADM_ACCOUNT`,`u`.`ADM_NAME` AS `ADM_NAME`,`u`.`EMPLOYEE_TYPE` AS `EMPLOYEE_TYPE`,`u`.`ADM_PHONE` AS `ADM_PHONE`,`u`.`EMAIL` AS `EMAIL`,`u`.`A_STATUS` AS `A_STATUS`,`u`.`A_CLASSIFIED` AS `A_CLASSIFIED`,`u`.`A_ADM_COMPANY` AS `A_ADM_COMPANY`,group_concat(`ua`.`ID_ZASOB` separator ',') AS `ID_ZASOB_CSV_NUM` from (`ADMIN_USERS` `u` left join `CRM_AUTH_PROFILE` `ua` on(((`ua`.`REMOTE_ID` = `u`.`ID`) and (`ua`.`REMOTE_TABLE` = 'ADMIN_USERS')))) where (`u`.`A_STATUS` in ('WAITING','NORMAL','MONITOR','WARNING')) group by `u`.`ID`;
+CREATE or REPLACE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `KONTAKTY_view` AS select `u`.`ID` AS `ID`,`u`.`ADM_ACCOUNT` AS `ADM_ACCOUNT`,`u`.`ADM_NAME` AS `ADM_NAME`,`u`.`EMPLOYEE_TYPE` AS `EMPLOYEE_TYPE`,`u`.`ADM_PHONE` AS `ADM_PHONE`,`u`.`EMAIL` AS `EMAIL`,`u`.`A_STATUS` AS `A_STATUS`,`u`.`A_CLASSIFIED` AS `A_CLASSIFIED`,`u`.`A_ADM_COMPANY` AS `A_ADM_COMPANY`,group_concat(`ua`.`ID_ZASOB` separator ',') AS `ID_ZASOB_CSV_NUM` from (`ADMIN_USERS` `u` left join `CRM_AUTH_PROFILE` `ua` on(((`ua`.`REMOTE_ID` = `u`.`ID`) and (`ua`.`REMOTE_TABLE` = 'ADMIN_USERS')))) where (`u`.`A_STATUS` in ('WAITING','NORMAL','MONITOR','WARNING')) group by `u`.`ID`;
 ";
 
 

+ 1 - 1
SE/superedit-GRAPH_VIEW_PROCES.php

@@ -449,7 +449,7 @@ class GraphViewProcessParser {
 				left join CRM_LISTA_ZASOBOW as czp on(czp.ID=cz.PARENT_ID)
 			where cw.ID_PROCES in(".implode(',', array_keys($id_proces_obj)).")
 				and cw.A_STATUS in ('NORMAL','WAITING')
-				and czp.`TYPE` in ('TABELA')
+			--	and czp.`TYPE` in ('TABELA')
 				{$filter}
 		";
 		$res = $db->query($sql);