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

Non conflict files

Browse Source
This commit is contained in:
danteloayza
2015-03-26 17:37:32 -04:00
parent c2d32d4f59
commit cff0e2c6e1
69 changed files with 25583 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
workflow/engine/methods/setup/setupSchemas/triggerFillReportByProcess.sql Normal file
View File

@@ -0,0 +1,65 @@
SET @INIT_DATE = '{init_date}';
SET @FINISH_DATE = '{finish_date}';
DELETE FROM PRO_REPORTING WHERE `YEAR` >= DATE_FORMAT(CAST(@INIT_DATE AS DATE), '%Y')
AND `MONTH` >= DATE_FORMAT(CAST(@INIT_DATE AS DATE), '%m')
AND `YEAR` <= DATE_FORMAT(CAST(@FINISH_DATE AS DATE), '%Y')
AND `MONTH` <= DATE_FORMAT(CAST(@FINISH_DATE AS DATE), '%m');
INSERT INTO PRO_REPORTING (
PRO_UID,
`MONTH`,
`YEAR`,
AVG_TIME,
SDV_TIME,
TOTAL_CASES_IN,
TOTAL_CASES_OUT,
CONFIGURED_PROCESS_TIME,
CONFIGURED_PROCESS_COST,
TOTAL_CASES_OPEN,
TOTAL_CASES_OVERDUE,
TOTAL_CASES_ON_TIME
)
SELECT
APPLICATION.PRO_UID,
DATE_FORMAT(APPLICATION.APP_INIT_DATE, '%m') AS `MONTH`,
DATE_FORMAT(APPLICATION.APP_INIT_DATE, '%Y') AS `YEAR`,
AVG(APPLICATION.APP_DURATION) AS `AVG_TIME`,
STD(APPLICATION.APP_DURATION) AS `STD_TIME`,
COUNT(APPLICATION.APP_INIT_DATE) AS `TOTAL_CASES_IN`,
COUNT(APPLICATION.APP_FINISH_DATE) AS `TOTAL_CASES_OUT`,
NULL,
NULL,
count(if(APPLICATION.APP_FINISH_DATE != null, NULL, 1)) AS TOTAL_CASES_OPEN,
count(if(APPLICATION.APP_DELAY_DURATION > 0, 1, NULL)) AS TOTAL_CASES_OVERDUE,
count(if(APPLICATION.APP_DELAY_DURATION <= 0, 1, NULL)) AS TOTAL_CASES_ON_TIME
FROM
APPLICATION FORCE INDEX (PRIMARY)
WHERE
APPLICATION.APP_INIT_DATE BETWEEN CAST(@INIT_DATE AS DATETIME) AND CAST(@FINISH_DATE AS DATETIME)
GROUP BY APPLICATION.PRO_UID;
UPDATE PRO_REPORTING
SET PRO_REPORTING.CONFIGURED_PROCESS_TIME = (
SELECT SUM(if (TASK.TAS_TIMEUNIT = "DAYS", (TASK.TAS_DURATION*8), TASK.TAS_DURATION))
FROM TASK
WHERE PRO_REPORTING.PRO_UID = TASK.PRO_UID
);
UPDATE PRO_REPORTING
SET PRO_REPORTING.CONFIGURED_PROCESS_COST = (
SELECT SUM(USERS.USR_COST_BY_HOUR)
FROM TASK, TASK_USER, USERS
WHERE TASK.PRO_UID = PRO_REPORTING.PRO_UID
AND TASK.TAS_UID = TASK_USER.TAS_UID
AND TASK_USER.USR_UID = USERS.USR_UID
) OR (
SELECT SUM(USERS.USR_COST_BY_HOUR)
FROM TASK, TASK_USER, GROUP_USER, USERS
WHERE PRO_REPORTING.PRO_UID = TASK.PRO_UID
AND TASK.TAS_UID = TASK_USER.TAS_UID
AND TASK_USER.USR_UID = GROUP_USER.GRP_UID
AND GROUP_USER.USR_UID = USERS.USR_UID
)

61
workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql Normal file
View File

@@ -0,0 +1,61 @@
SET @INIT_DATE = '{init_date}';
SET @FINISH_DATE = '{finish_date}';
DELETE FROM USR_REPORTING WHERE `YEAR` >= DATE_FORMAT(CAST(@INIT_DATE AS DATE), '%Y')
AND `MONTH` >= DATE_FORMAT(CAST(@INIT_DATE AS DATE), '%m')
AND `YEAR` <= DATE_FORMAT(CAST(@FINISH_DATE AS DATE), '%Y')
AND `MONTH` <= DATE_FORMAT(CAST(@FINISH_DATE AS DATE), '%m');
INSERT INTO USR_REPORTING (
USR_UID,
TAS_UID,
PRO_UID,
MONTH,
YEAR,
TOTAL_TIME_BY_TASK,
TOTAL_CASES_IN,
TOTAL_CASES_OUT,
USER_HOUR_COST,
AVG_TIME,
SDV_TIME,
CONFIGURED_TASK_TIME,
TOTAL_CASES_OVERDUE,
TOTAL_CASES_ON_TIME
)
SELECT
ACV.USR_UID,
ACV.TAS_UID,
ACV.PRO_UID,
DATE_FORMAT(ACV.DEL_INIT_DATE, '%m') AS `MONTH`,
DATE_FORMAT(ACV.DEL_INIT_DATE, '%Y') AS `YEAR`,
SUM(ACV.DEL_DURATION) AS TOT_TIME_BY_TASK,
COUNT(ACV.DEL_INIT_DATE) AS TOT_CASES_IN,
COUNT(ACV.DEL_FINISH_DATE) AS TOT_CASES_OUT,
NULL,
AVG(DEL_DURATION) AS `AVG_TIME`,
STD(DEL_DURATION) AS `STD_TIME`,
NULL,
count(if(ACV.DEL_DELAY_DURATION > 0, 1, NULL)) AS TOTAL_CASES_OVERDUE,
count(if(ACV.DEL_DELAY_DURATION <= 0, 1, NULL)) AS TOTAL_CASES_ON_TIME
FROM
APP_CACHE_VIEW AS ACV
WHERE
ACV.DEL_INIT_DATE BETWEEN CAST(@INIT_DATE AS DATETIME) AND CAST(@FINISH_DATE AS DATETIME)
GROUP BY ACV.USR_UID , ACV.TAS_UID , ACV.PRO_UID;
UPDATE USR_REPORTING
INNER JOIN
USERS
ON USR_REPORTING.USR_UID = USERS.USR_UID
SET USR_REPORTING.USER_HOUR_COST = USERS.USR_COST_BY_HOUR;
UPDATE USR_REPORTING
INNER JOIN
TASK
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)

34
workflow/engine/methods/strategicDashboard/main.php Normal file
View File

@@ -0,0 +1,34 @@
<?php
/**
* dashboard.php
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2008 Colosa Inc.23
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
$RBAC->requirePermissions( 'PM_DASHBOARD' );
$G_MAIN_MENU = 'processmaker';
$G_ID_MENU_SELECTED = 'DASHBOARD+';
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'view', 'strategicDashboard/load' );
G::RenderPage( 'publish' );

27
workflow/engine/methods/users/usersAjax.php
View File

@@ -1,13 +1,4 @@
<?php
G::LoadSystem('inputfilter');
$filter = new InputFilter();
$_POST = $filter->xssFilterHard($_POST);
if(isset($_SESSION['USER_LOGGED'])) {
$_SESSION['USER_LOGGED'] = $filter->xssFilterHard($_SESSION['USER_LOGGED']);
}
if(isset($_SESSION['USR_USERNAME'])) {
$_SESSION['USR_USERNAME'] = $filter->xssFilterHard($_SESSION['USR_USERNAME']);
}
global $RBAC;
$result = new StdClass();
@@ -164,6 +155,10 @@ switch ($_POST['action']) {
$zipCode = $form['USR_ZIP_CODE'] ? " - Zip Code: ". $form['USR_ZIP_CODE'] : "";
$position = $form['USR_POSITION'] ? " - Position: ". $form['USR_POSITION'] : "";
$role = $form['USR_ROLE'] ? " - Role: ". $form['USR_ROLE'] : "";
/*----------------------------------********---------------------------------*/
$costByHour = $form['USR_COST_BY_HOUR'] ? $form['USR_COST_BY_HOUR'] : "";
$unit = $form['USR_UNIT_COST'] ? $form['USR_UNIT_COST'] : "";
/*----------------------------------********---------------------------------*/
if ($form['USR_UID'] == '') {
$criteria = new Criteria();
@@ -182,6 +177,7 @@ switch ($_POST['action']) {
$aData['USR_UPDATE_DATE'] = date('Y-m-d H:i:s');
$aData['USR_BIRTHDAY'] = date('Y-m-d');
$aData['USR_AUTH_USER_DN'] = $form['USR_AUTH_USER_DN'];
//fixing bug in inactive user when the admin create a new user.
$statusWF = $form['USR_STATUS'];
$aData['USR_STATUS'] = $form['USR_STATUS'] ;//== 'ACTIVE' ? 1 : 0;
@@ -202,6 +198,10 @@ switch ($_POST['action']) {
$aData['USR_POSITION'] = $form['USR_POSITION'];
// $aData['USR_RESUME'] = $form['USR_RESUME'];
$aData['USR_ROLE'] = $form['USR_ROLE'];
/*----------------------------------********---------------------------------*/
$aData['USR_COST_BY_HOUR'] = $form['USR_COST_BY_HOUR'];
$aData['USR_UNIT_COST'] = $form['USR_UNIT_COST'];
/*----------------------------------********---------------------------------*/
$aData['USR_REPLACED_BY'] = $form['USR_REPLACED_BY'];
require_once 'classes/model/Users.php';
@@ -373,7 +373,14 @@ switch ($_POST['action']) {
if (isset($form['USR_ROLE'])) {
$aData['USR_ROLE'] = $form['USR_ROLE'];
}
/*----------------------------------********---------------------------------*/
if (isset($form['USR_COST_BY_HOUR'])) {
$aData['USR_COST_BY_HOUR'] = $form['USR_COST_BY_HOUR'];
}
if (isset($form['USR_UNIT_COST'])) {
$aData['USR_UNIT_COST'] = $form['USR_UNIT_COST'];
}
/*----------------------------------********---------------------------------*/
if (isset($form['USR_REPLACED_BY'])) {
$aData['USR_REPLACED_BY'] = $form['USR_REPLACED_BY'];
}