fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add field tas_duration in app_cache_view

Browse Source
This commit is contained in:
Marco Antonio Nina Mena
2015-04-13 11:48:14 -04:00
parent 9ff5281c16
commit 6117eb75c6
10 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/config/schema.xml
View File

@@ -2458,6 +2458,7 @@
<column name="APP_FINISH_DATE" type="TIMESTAMP" required="false"/> <column name="APP_FINISH_DATE" type="TIMESTAMP" required="false"/>
<column name="APP_UPDATE_DATE" type="TIMESTAMP" required="true"/> <column name="APP_UPDATE_DATE" type="TIMESTAMP" required="true"/>
<column name="APP_OVERDUE_PERCENTAGE" type="DOUBLE" required="true"/> <column name="APP_OVERDUE_PERCENTAGE" type="DOUBLE" required="true"/>
<column name="TAS_DURATION" type="DOUBLE" required="true" default="0"/>
<index name="indexAppNumber"> <index name="indexAppNumber">
<index-column name="APP_NUMBER"/> <index-column name="APP_NUMBER"/>
<vendor type="mysql"> <vendor type="mysql">

8
workflow/engine/data/mysql/insert.sql
View File

@@ -4542,7 +4542,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_PROCESS_INEFFICIENCE','en','Process Inefficiency Cost','2015-04-01') , ( 'LABEL','ID_PROCESS_INEFFICIENCE','en','Process Inefficiency Cost','2015-04-01') ,
( 'LABEL','ID_EMPLYEE_EFFICIENCIE','en','Employee Efficience Index','2015-03-09') , ( 'LABEL','ID_EMPLYEE_EFFICIENCIE','en','Employee Efficience Index','2015-03-09') ,
( 'LABEL','ID_USER_INEFFICIENCE','en','Inefficience Cost By User','2015-03-09') , ( 'LABEL','ID_USER_INEFFICIENCE','en','Inefficience Cost By User','2015-03-09') ,
( 'LABEL','ID_OVER_DUE','en','% Overdue','2015-04-01') , ( 'LABEL','ID_OVER_DUE','en','Status','2015-04-01') ,
( 'LABEL','ID_NEW_CASES','en','% New Cases','2015-04-06') , ( 'LABEL','ID_NEW_CASES','en','% New Cases','2015-04-06') ,
( 'LABEL','ID_COMPLETED_CASES','en','Completed Cases','2015-03-09') , ( 'LABEL','ID_COMPLETED_CASES','en','Completed Cases','2015-03-09') ,
( 'LABEL','ID_WORKING_CASES','en','% In Progress','2015-04-06') , ( 'LABEL','ID_WORKING_CASES','en','% In Progress','2015-04-06') ,
@@ -59976,8 +59976,4 @@ INSERT INTO CATALOG (CAT_UID, CAT_LABEL_ID, CAT_TYPE, CAT_FLAG, CAT_OBSERVATION,
('400','ID_YEAR','PERIODICITY','','','2015-03-04','2015-03-04'), ('400','ID_YEAR','PERIODICITY','','','2015-03-04','2015-03-04'),
('1010','ID_PROCESS_EFFICIENCE','INDICATOR','','','2015-03-04','2015-03-04'), ('1010','ID_PROCESS_EFFICIENCE','INDICATOR','','','2015-03-04','2015-03-04'),
('1030','ID_EMPLYEE_EFFICIENCIE','INDICATOR','','','2015-03-04','2015-03-04'), ('1030','ID_EMPLYEE_EFFICIENCIE','INDICATOR','','','2015-03-04','2015-03-04'),
('1040','ID_USER_INEFFICIENCE','INDICATOR','','','2015-03-04','2015-03-04'), ('1050','ID_OVER_DUE','INDICATOR','%','Unit for displaying','2015-03-04','2015-03-04');
('1050','ID_OVER_DUE','INDICATOR','%','Unit for displaying','2015-03-04','2015-03-04'),
('1060','ID_NEW_CASES','INDICATOR','','','2015-03-04','2015-03-04'),
('1070','ID_COMPLETED_CASES','INDICATOR','','','2015-03-04','2015-03-04'),
('1080','ID_WORKING_CASES','INDICATOR','','','2015-03-04','2015-03-04');

3
workflow/engine/data/mysql/schema.sql
View File

@@ -1175,6 +1175,7 @@ CREATE TABLE `APP_CACHE_VIEW`
`APP_FINISH_DATE` DATETIME, `APP_FINISH_DATE` DATETIME,
`APP_UPDATE_DATE` DATETIME NOT NULL, `APP_UPDATE_DATE` DATETIME NOT NULL,
`APP_OVERDUE_PERCENTAGE` DOUBLE NOT NULL, `APP_OVERDUE_PERCENTAGE` DOUBLE NOT NULL,
`TAS_DURATION` DOUBLE default 0 NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`), PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
KEY `indexAppNumber`(`APP_NUMBER`), KEY `indexAppNumber`(`APP_NUMBER`),
KEY `protitle`(`APP_PRO_TITLE`), KEY `protitle`(`APP_PRO_TITLE`),
@@ -2786,7 +2787,7 @@ CREATE TABLE `DASHBOARD_DAS_IND`
( (
`DAS_UID` VARCHAR(32) default '' NOT NULL, `DAS_UID` VARCHAR(32) default '' NOT NULL,
`OWNER_UID` VARCHAR(32) default '' NOT NULL, `OWNER_UID` VARCHAR(32) default '' NOT NULL,
`OWNER_TYPE` VARCHAR(15) default '' NOT NULL `OWNER_TYPE` VARCHAR(15) default '' NOT NULL,
PRIMARY KEY (`DAS_UID`), PRIMARY KEY (`DAS_UID`),
CONSTRAINT `fk_dashboard_indicator_dashboard_das_ind` CONSTRAINT `fk_dashboard_indicator_dashboard_das_ind`
FOREIGN KEY (`DAS_UID`) FOREIGN KEY (`DAS_UID`)

1
workflow/engine/methods/setup/setupSchemas/app_cache_view.sql
View File

@@ -31,6 +31,7 @@ CREATE TABLE `APP_CACHE_VIEW`
`APP_FINISH_DATE` DATETIME, `APP_FINISH_DATE` DATETIME,
`APP_UPDATE_DATE` DATETIME NOT NULL, `APP_UPDATE_DATE` DATETIME NOT NULL,
`APP_OVERDUE_PERCENTAGE` DOUBLE NOT NULL, `APP_OVERDUE_PERCENTAGE` DOUBLE NOT NULL,
`TAS_DURATION` DOUBLE default 0 NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`), PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
KEY `indexAppNumber`(`APP_NUMBER`), KEY `indexAppNumber`(`APP_NUMBER`),
KEY `indexAppUser`(`USR_UID`, `APP_STATUS`) KEY `indexAppUser`(`USR_UID`, `APP_STATUS`)

6
workflow/engine/methods/setup/setupSchemas/app_cache_view_insert.sql
View File

@@ -33,7 +33,8 @@ INSERT INTO APP_CACHE_VIEW (
APP_FINISH_DATE, APP_FINISH_DATE,
APP_UPDATE_DATE, APP_UPDATE_DATE,
APP_OVERDUE_PERCENTAGE, APP_OVERDUE_PERCENTAGE,
DEL_LAST_INDEX DEL_LAST_INDEX,
TAS_DURATION
) )
SELECT SELECT
@@ -77,7 +78,8 @@ SELECT
IF (APPLICATION.APP_STATUS = 'COMPLETED', APPLICATION.APP_FINISH_DATE, NULL), IF (APPLICATION.APP_STATUS = 'COMPLETED', APPLICATION.APP_FINISH_DATE, NULL),
APPLICATION.APP_UPDATE_DATE, APPLICATION.APP_UPDATE_DATE,
APP_DELEGATION.APP_OVERDUE_PERCENTAGE, APP_DELEGATION.APP_OVERDUE_PERCENTAGE,
APP_DELEGATION.DEL_LAST_INDEX APP_DELEGATION.DEL_LAST_INDEX,
if (TASK.TAS_TIMEUNIT = "DAYS", TASK.TAS_DURATION, (TASK.TAS_DURATION/24))
FROM FROM
APPLICATION FORCE INDEX (PRIMARY) APPLICATION FORCE INDEX (PRIMARY)
LEFT JOIN APP_DELEGATION ON (APPLICATION.APP_UID=APP_DELEGATION.APP_UID) LEFT JOIN APP_DELEGATION ON (APPLICATION.APP_UID=APP_DELEGATION.APP_UID)

8
workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql
View File

@@ -12,6 +12,7 @@ BEGIN
DECLARE PREVIOUS_USR_UID VARCHAR(32); DECLARE PREVIOUS_USR_UID VARCHAR(32);
DECLARE APP_DEL_PREVIOUS_USER VARCHAR(255); DECLARE APP_DEL_PREVIOUS_USER VARCHAR(255);
DECLARE APP_THREAD_STATUS VARCHAR(32); DECLARE APP_THREAD_STATUS VARCHAR(32);
DECLARE TAS_DURATION DOUBLE;
SET @DEFAULT_LANG = '{lang}'; SET @DEFAULT_LANG = '{lang}';
SET @APP_CURRENT_USER = ''; SET @APP_CURRENT_USER = '';
SELECT APPLICATION.APP_NUMBER into @APP_NUMBER FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1; SELECT APPLICATION.APP_NUMBER into @APP_NUMBER FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1;
@@ -42,6 +43,7 @@ BEGIN
SET @APP_THREAD_STATUS = 'OPEN'; SET @APP_THREAD_STATUS = 'OPEN';
END IF; END IF;
SET @TAS_TYPE = (SELECT TAS_TYPE FROM TASK WHERE TAS_UID = NEW.TAS_UID LIMIT 1); SET @TAS_TYPE = (SELECT TAS_TYPE FROM TASK WHERE TAS_UID = NEW.TAS_UID LIMIT 1);
SELECT IF (TASK.TAS_TIMEUNIT = "DAYS", TASK.TAS_DURATION, (TASK.TAS_DURATION/24)) into @TAS_DURATION FROM TASK WHERE TAS_UID = NEW.TAS_UID LIMIT 1;
UPDATE APP_CACHE_VIEW SET DEL_LAST_INDEX = 0 WHERE APP_UID = NEW.APP_UID; UPDATE APP_CACHE_VIEW SET DEL_LAST_INDEX = 0 WHERE APP_UID = NEW.APP_UID;
IF( @TAS_TYPE != 'SUBPROCESS') THEN IF( @TAS_TYPE != 'SUBPROCESS') THEN
INSERT INTO `APP_CACHE_VIEW` ( INSERT INTO `APP_CACHE_VIEW` (
@@ -75,7 +77,8 @@ BEGIN
APP_FINISH_DATE, APP_FINISH_DATE,
APP_UPDATE_DATE, APP_UPDATE_DATE,
APP_OVERDUE_PERCENTAGE, APP_OVERDUE_PERCENTAGE,
DEL_LAST_INDEX DEL_LAST_INDEX,
TAS_DURATION
) )
VALUES ( VALUES (
NEW.APP_UID, NEW.APP_UID,
@@ -108,7 +111,8 @@ BEGIN
NULL, NULL,
NOW(), NOW(),
NEW.APP_OVERDUE_PERCENTAGE, NEW.APP_OVERDUE_PERCENTAGE,
NEW.DEL_LAST_INDEX NEW.DEL_LAST_INDEX,
@TAS_DURATION
); );
END IF; END IF;
END END

5
workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql
View File

@@ -12,6 +12,7 @@ BEGIN
DECLARE PREVIOUS_USR_UID VARCHAR(32); DECLARE PREVIOUS_USR_UID VARCHAR(32);
DECLARE APP_DEL_PREVIOUS_USER VARCHAR(255); DECLARE APP_DEL_PREVIOUS_USER VARCHAR(255);
DECLARE APP_THREAD_STATUS VARCHAR(32); DECLARE APP_THREAD_STATUS VARCHAR(32);
DECLARE TAS_DURATION DOUBLE;
SET @DEFAULT_LANG = '{lang}'; SET @DEFAULT_LANG = '{lang}';
SET @APP_CURRENT_USER = ''; SET @APP_CURRENT_USER = '';
SELECT APPLICATION.APP_NUMBER into @APP_NUMBER FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1; SELECT APPLICATION.APP_NUMBER into @APP_NUMBER FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1;
@@ -42,6 +43,7 @@ BEGIN
SET @APP_THREAD_STATUS = 'OPEN'; SET @APP_THREAD_STATUS = 'OPEN';
END IF; END IF;
SET @TAS_TYPE = (SELECT TAS_TYPE FROM TASK WHERE TAS_UID = NEW.TAS_UID LIMIT 1); SET @TAS_TYPE = (SELECT TAS_TYPE FROM TASK WHERE TAS_UID = NEW.TAS_UID LIMIT 1);
SELECT IF (TASK.TAS_TIMEUNIT = "DAYS", TASK.TAS_DURATION, (TASK.TAS_DURATION/24)) into @TAS_DURATION FROM TASK WHERE TAS_UID = NEW.TAS_UID LIMIT 1;
IF( @TAS_TYPE != 'SUBPROCESS') THEN IF( @TAS_TYPE != 'SUBPROCESS') THEN
UPDATE `APP_CACHE_VIEW` UPDATE `APP_CACHE_VIEW`
SET SET
@@ -71,7 +73,8 @@ BEGIN
DEL_DELAYED = NEW.DEL_DELAYED, DEL_DELAYED = NEW.DEL_DELAYED,
APP_FINISH_DATE = NULL, APP_FINISH_DATE = NULL,
APP_OVERDUE_PERCENTAGE = NEW.APP_OVERDUE_PERCENTAGE, APP_OVERDUE_PERCENTAGE = NEW.APP_OVERDUE_PERCENTAGE,
DEL_LAST_INDEX = NEW.DEL_LAST_INDEX DEL_LAST_INDEX = NEW.DEL_LAST_INDEX,
TAS_DURATION = @TAS_DURATION
WHERE WHERE
APP_UID = NEW.APP_UID APP_UID = NEW.APP_UID
AND DEL_INDEX = NEW.DEL_INDEX; AND DEL_INDEX = NEW.DEL_INDEX;

2
workflow/engine/methods/setup/setupSchemas/triggerFillReportByProcess.sql
View File

@@ -42,7 +42,7 @@ GROUP BY APPLICATION.PRO_UID;
UPDATE PRO_REPORTING UPDATE PRO_REPORTING
SET PRO_REPORTING.CONFIGURED_PROCESS_TIME = ( SET PRO_REPORTING.CONFIGURED_PROCESS_TIME = (
SELECT SUM(if (TASK.TAS_TIMEUNIT = "DAYS", (TASK.TAS_DURATION*8), TASK.TAS_DURATION)) SELECT SUM(if (TASK.TAS_TIMEUNIT = "DAYS", (TASK.TAS_DURATION*24), TASK.TAS_DURATION))
FROM TASK FROM TASK
WHERE PRO_REPORTING.PRO_UID = TASK.PRO_UID WHERE PRO_REPORTING.PRO_UID = TASK.PRO_UID
); );

2
workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql
View File

@@ -55,7 +55,7 @@ UPDATE USR_REPORTING
INNER JOIN INNER JOIN
TASK TASK
ON USR_REPORTING.TAS_UID = TASK.TAS_UID ON USR_REPORTING.TAS_UID = TASK.TAS_UID
SET USR_REPORTING.CONFIGURED_TASK_TIME = if (TASK.TAS_TIMEUNIT = "DAYS", (TASK.TAS_DURATION*8), TASK.TAS_DURATION) SET USR_REPORTING.CONFIGURED_TASK_TIME = if (TASK.TAS_TIMEUNIT = "DAYS", (TASK.TAS_DURATION*24), TASK.TAS_DURATION)

6
workflow/engine/templates/strategicDashboard/formDashboard.js
View File

@@ -504,7 +504,7 @@ Ext.onReady( function() {
enableTabScroll : true, enableTabScroll : true,
//anchor : '98%', //anchor : '98%',
width : '100%', width : '100%',
height : 315, height : 260,
defaults : { defaults : {
autoScroll :true autoScroll :true
}, },
@@ -730,7 +730,7 @@ var addTab = function (flag) {
width : "100%", width : "100%",
items : [ items : [
new Ext.Panel({ new Ext.Panel({
height : 275, height : 230,
width : "100%", width : "100%",
border : true, border : true,
bodyStyle : 'padding:10px', bodyStyle : 'padding:10px',
@@ -797,6 +797,7 @@ var addTab = function (flag) {
paddingLeft: "30px", paddingLeft: "30px",
marginLeft : "60px", marginLeft : "60px",
layout : 'hbox', layout : 'hbox',
hidden : true,
items : [ items : [
new Ext.form.ComboBox({ new Ext.form.ComboBox({
editable : false, editable : false,
@@ -828,6 +829,7 @@ var addTab = function (flag) {
anchor : '40%', anchor : '40%',
maskRe : /([0-9\.]+)$/, maskRe : /([0-9\.]+)$/,
maxLength : 9, maxLength : 9,
value : 1,
width : 80, width : 80,
allowBlank : false, allowBlank : false,
listeners : { listeners : {