\
\
\
diff --git a/workflow/engine/methods/cases/casesListExtJs.php b/workflow/engine/methods/cases/casesListExtJs.php
index 48e7560e3..650de87f1 100755
--- a/workflow/engine/methods/cases/casesListExtJs.php
+++ b/workflow/engine/methods/cases/casesListExtJs.php
@@ -4,6 +4,10 @@ unset($_SESSION['APPLICATION']);
//get the action from GET or POST, default is todo
$action = isset( $_GET['action'] ) ? $_GET['action'] : (isset( $_POST['action'] ) ? $_POST['action'] : 'todo');
+/*----------------------------------********---------------------------------*/
+$filterAction = isset( $_GET['filterAction'] ) ? $_GET['filterAction'] : (isset( $_POST['filterAction'] ) ? $_POST['filterAction'] : '');
+/*----------------------------------********---------------------------------*/
+
//fix a previous inconsistency
$urlProxy = 'proxyCasesList';
if ($action == 'selfservice') {
@@ -143,7 +147,7 @@ if ($action == "todo" || $action == "draft" || $action == "sent" || $action == "
$solrConf['solr_instance']
);
if ($applicationSolrIndex->isSolrEnabled()) {
- $solrEnabled = 1;
+ $solrEnabled = 1;
}
}
}
@@ -179,6 +183,28 @@ $oHeadPublisher->assign( 'allUsersValues', $allUsers ); //Sending the listing of
$oHeadPublisher->assign( 'solrEnabled', $solrEnabled ); //Sending the status of solar
$oHeadPublisher->assign( 'enableEnterprise', $enableEnterprise ); //sending the page size
+
+/*----------------------------------********---------------------------------*/
+$licensedFeatures = & PMLicensedFeatures::getSingleton();
+if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=') ) {
+ $filterStatus[] = array('', G::LoadTranslation('ID_ALL_STATUS'));
+ $filterStatus[] = array('ON_TIME', G::LoadTranslation('ID_ON_TIME'));
+ $filterStatus[] = array('AT_RISK', G::LoadTranslation('ID_AT_RISK'));
+ $filterStatus[] = array('OVERDUE', G::LoadTranslation('ID_TASK_OVERDUE'));
+
+ $oHeadPublisher->assign('filterStatus', $filterStatus);
+
+ if (isset($_COOKIE['dashboardListInbox'])) {
+ $oHeadPublisher->assign('valueFilterStatus', $_COOKIE['dashboardListInbox']);
+ if (PHP_VERSION < 5.2) {
+ setcookie("dashboardListInbox", '', time() + (24 * 60 * 60), "/sys" . SYS_SYS, "; HttpOnly");
+ } else {
+ setcookie("dashboardListInbox", '', time() + (24 * 60 * 60), "/sys" . SYS_SYS, null, false, true);
+ }
+ }
+}
+/*----------------------------------********---------------------------------*/
+
//menu permissions
/*$c = new Criteria('workflow');
$c->clearSelectColumns();
diff --git a/workflow/engine/methods/cases/proxyNewCasesList.php b/workflow/engine/methods/cases/proxyNewCasesList.php
index 7e1a3f394..a916a2d4e 100644
--- a/workflow/engine/methods/cases/proxyNewCasesList.php
+++ b/workflow/engine/methods/cases/proxyNewCasesList.php
@@ -32,6 +32,7 @@ try {
$filters['action'] = isset( $_REQUEST["action"] ) ? $_REQUEST["action"] : "";
$listName = isset( $_REQUEST["list"] ) ? $_REQUEST["list"] : "inbox";
+ $filters['filterStatus'] = isset( $_REQUEST["filterStatus"] ) ? $_REQUEST["filterStatus"] : "";
// Select list
switch ($listName) {
@@ -145,16 +146,17 @@ try {
);
$filtersData = array();
- $filtersData['start'] = $filters['start'];
- $filtersData['limit'] = $filters['limit'];
- $filtersData['sort'] = G::toLower($filters['sort']);
- $filtersData['dir'] = G::toLower($filters['dir']);
- $filtersData['cat_uid'] = $filters['category'];
- $filtersData['pro_uid'] = $filters['process'];
- $filtersData['search'] = $filters['search'];
- $filtersData['date_from'] = $filters['dateFrom'];
- $filtersData['date_to'] = $filters['dateTo'];
- $filtersData["action"] = $filters["action"];
+ $filtersData['start'] = $filters['start'];
+ $filtersData['limit'] = $filters['limit'];
+ $filtersData['sort'] = G::toLower($filters['sort']);
+ $filtersData['dir'] = G::toLower($filters['dir']);
+ $filtersData['cat_uid'] = $filters['category'];
+ $filtersData['pro_uid'] = $filters['process'];
+ $filtersData['search'] = $filters['search'];
+ $filtersData['date_from'] = $filters['dateFrom'];
+ $filtersData['date_to'] = $filters['dateTo'];
+ $filtersData["action"] = $filters["action"];
+ $filtersData["filterStatus"] = $filters['filterStatus'];
$response = array();
$response['filters'] = $filtersData;
diff --git a/workflow/engine/methods/setup/setupSchemas/triggerFillReportByProcess.sql b/workflow/engine/methods/setup/setupSchemas/triggerFillReportByProcess.sql
index bfb22baf7..6ff6ad621 100644
--- a/workflow/engine/methods/setup/setupSchemas/triggerFillReportByProcess.sql
+++ b/workflow/engine/methods/setup/setupSchemas/triggerFillReportByProcess.sql
@@ -18,7 +18,9 @@ INSERT INTO PRO_REPORTING (
CONFIGURED_PROCESS_COST,
TOTAL_CASES_OPEN,
TOTAL_CASES_OVERDUE,
- TOTAL_CASES_ON_TIME
+ TOTAL_CASES_ON_TIME,
+ PRO_COST,
+ PRO_UNIT_COST
)
SELECT
APPLICATION.PRO_UID,
@@ -32,13 +34,22 @@ SELECT
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
+ count(if(APPLICATION.APP_DELAY_DURATION <= 0, 1, NULL)) AS TOTAL_CASES_ON_TIME,
+ 0,
+ NULL
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 USR_REPORTING
+INNER JOIN
+PROCESS
+ON USR_REPORTING.PRO_UID = PROCESS.PRO_UID
+SET USR_REPORTING.PRO_COST = PROCESS.PRO_COST,
+USR_REPORTING.PRO_UNIT_COST = PROCESS.PRO_UNIT_COST;
+
#TODO task duration should be calculated with the calendar
UPDATE PRO_REPORTING
SET PRO_REPORTING.CONFIGURED_PROCESS_TIME = (
diff --git a/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql b/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql
index 44305b1e9..a630c7b43 100644
--- a/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql
+++ b/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql
@@ -12,6 +12,7 @@ INSERT INTO USR_REPORTING (
PRO_UID,
MONTH,
YEAR,
+ TOTAL_QUEUE_TIME_BY_TASK,
TOTAL_TIME_BY_TASK,
TOTAL_CASES_IN,
TOTAL_CASES_OUT,
@@ -20,7 +21,9 @@ INSERT INTO USR_REPORTING (
SDV_TIME,
CONFIGURED_TASK_TIME,
TOTAL_CASES_OVERDUE,
- TOTAL_CASES_ON_TIME
+ TOTAL_CASES_ON_TIME,
+ PRO_COST,
+ PRO_UNIT_COST
)
SELECT
@@ -29,6 +32,7 @@ SELECT
ACV.PRO_UID,
DATE_FORMAT(ACV.DEL_INIT_DATE, '%m') AS `MONTH`,
DATE_FORMAT(ACV.DEL_INIT_DATE, '%Y') AS `YEAR`,
+ SUM(ACV.DEL_QUEUE_DURATION*24) AS TOTAL_QUEUE_TIME_BY_TASK,
SUM(ACV.DEL_DURATION*24) AS TOT_TIME_BY_TASK,
COUNT(ACV.DEL_INIT_DATE) AS TOT_CASES_IN,
COUNT(ACV.DEL_FINISH_DATE) AS TOT_CASES_OUT,
@@ -37,7 +41,9 @@ SELECT
STD(DEL_DURATION*24) 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
+ count(if(ACV.DEL_DELAY_DURATION <= 0, 1, NULL)) AS TOTAL_CASES_ON_TIME,
+ 0,
+ NULL
FROM
APP_CACHE_VIEW AS ACV
WHERE
@@ -56,6 +62,13 @@ 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
+PROCESS
+ON USR_REPORTING.PRO_UID = PROCESS.PRO_UID
+SET USR_REPORTING.PRO_COST = PROCESS.PRO_COST,
+USR_REPORTING.PRO_UNIT_COST = PROCESS.PRO_UNIT_COST;
+
UPDATE USR_REPORTING
INNER JOIN TASK ON USR_REPORTING.TAS_UID = TASK.TAS_UID
SET USR_REPORTING.CONFIGURED_TASK_TIME =
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ReportingIndicators.php b/workflow/engine/src/ProcessMaker/BusinessModel/ReportingIndicators.php
index 913af9175..cd6336226 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ReportingIndicators.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ReportingIndicators.php
@@ -5,7 +5,41 @@ use \G;
class ReportingIndicators
{
-// /**et
+
+
+ /**
+ * Returns the historic data of an indicator
+ *
+ * @param array $indicatorUid indicator from which will be extracted the information
+ * @param DateTime $initDate date from the index will be calculated
+ * @param DateTime $endDate date until the index will be calculated
+ * @param string $language language for the names (en, es, etc.)
+ *
+ * return decimal value
+ */
+ public function getHistoricData($indicatorUid, $initDate, $endDate, $periodicity, $language)
+ {
+ G::loadClass('indicatorsCalculator');
+ $retval = "";
+ $calculator = new \IndicatorsCalculator();
+ $arr = $calculator->indicatorData($indicatorUid);
+ $indicator = $arr[0];
+ $processesId = $indicator['DAS_UID_PROCESS'];
+ $indicatorType = $indicator['DAS_IND_TYPE'];
+ switch ($indicatorType) {
+ case \ReportingIndicatorTypeEnum::PEI:
+ $retval = $calculator->peiHistoric($processesId, $initDate, $endDate, \ReportingPeriodicityEnum::fromValue($periodicity));
+ break;
+ case \ReportingIndicatorTypeEnum::UEI:
+ $retval = $calculator->ueiHistoric($processesId, $initDate, $endDate, \ReportingPeriodicityEnum::fromValue($periodicity));
+ break;
+ default:
+ throw new Exception("Can't retrive historic Data becasuse de indicator type " + $indicator['DAS_IND_TYPE'] + " has no operation associated.");
+ break;
+ }
+ return $retval;
+ }
+
/**
* Lists tasks of a process and it's statistics (efficiency, average times, etc.)
@@ -25,7 +59,7 @@ class ReportingIndicators
$arr = $calculator->indicatorData($indicatorUid);
$indicator = $arr[0];
$processesId = $indicator['DAS_UID_PROCESS'];
- $peiValue = current(reset($calculator-> peiHistoric($processesId, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE)));
+ $peiValue = current(reset($calculator->peiHistoric($processesId, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE)));
$peiCost = current(reset($calculator->peiCostHistoric($processesId, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE)));
$peiCompare = current(reset($calculator->peiHistoric($processesId, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE)));
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
index 1ab9fa4f6..e366e419f 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
@@ -166,6 +166,10 @@ class Task
array(
"TAS_TRANSFER_FLY" => $arrayDataAux["TAS_TRANSFER_FLY"],
"TAS_DURATION" => $arrayDataAux["TAS_DURATION"],
+ /*----------------------------------********---------------------------------*/
+ "TAS_AVERAGE" => $arrayDataAux["TAS_AVERAGE"],
+ "TAS_SDV" => $arrayDataAux["TAS_SDV"],
+ /*----------------------------------********---------------------------------*/
"TAS_TIMEUNIT" => $arrayDataAux["TAS_TIMEUNIT"],
"TAS_TYPE_DAY" => $arrayDataAux["TAS_TYPE_DAY"],
"TAS_CALENDAR" => $arrayDataAux["TAS_CALENDAR"]
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/ReportingIndicators.php b/workflow/engine/src/ProcessMaker/Services/Api/ReportingIndicators.php
index d8be9ffc7..12eb555fc 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/ReportingIndicators.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/ReportingIndicators.php
@@ -197,6 +197,31 @@ class ReportingIndicators extends Api
}
}
+ /**
+ * Get historic data of an indicator
+ *
+ * @return array
+ *
+ * @author Dante Loayza
+ * @copyright Colosa - Bolivia
+ *
+ * @url GET /indicator-historic-data
+ */
+ public function doGetHistoricDataFromIndicator($indicator_uid, $init_date, $end_date, $periodicity, $language) {
+ try {
+ $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
+ $response = $indicatorsObj->getHistoricData
+ ($indicator_uid,
+ new \DateTime($init_date),
+ new \DateTime($end_date),
+ $periodicity,
+ $language);
+ return $response;
+ } catch (\Exception $e) {
+ throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
+ }
+ }
+
}
diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js
index b27ac37ef..30fc95759 100755
--- a/workflow/engine/templates/cases/casesList.js
+++ b/workflow/engine/templates/cases/casesList.js
@@ -1,19 +1,19 @@
new Ext.KeyMap(document, {
- key: Ext.EventObject.F5,
+ key: Ext.EventObject.F5,
fn: function(keycode, e) {
- if (! e.ctrlKey) {
- if (Ext.isIE) {
- // IE6 doesn't allow cancellation of the F5 key, so trick it into
- // thinking some other key was pressed (backspace in this case)
- e.browserEvent.keyCode = 8;
+ if (! e.ctrlKey) {
+ if (Ext.isIE) {
+ // IE6 doesn't allow cancellation of the F5 key, so trick it into
+ // thinking some other key was pressed (backspace in this case)
+ e.browserEvent.keyCode = 8;
+ }
+ e.stopEvent();
+ //document.location = document.location;
+ storeCases.reload();
}
- e.stopEvent();
- //document.location = document.location;
- storeCases.reload();
- }
- else
- Ext.Msg.alert(_('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE'));
- }
+ else
+ Ext.Msg.alert(_('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE'));
+ }
});
@@ -27,892 +27,899 @@ var winReassignInCasesList;
function formatAMPM(date, initVal, calendarDate) {
- var currentDate = new Date();
- var currentDay = currentDate.getDate();
- var currentMonth = currentDate.getMonth()+1;
- if (currentDay < 10) {
- currentDay = '0' + currentDay;
- }
- if (currentMonth < 10) {
- currentMonth = '0' + currentMonth;
- }
- currentDate = currentMonth + '-' + currentDay;
- if (currentDate == calendarDate) {
- var hours = date.getHours();
- var minutes = (initVal === true)? ((date.getMinutes()<15)? 15: ((date.getMinutes()<30)? 30: ((date.getMinutes()<45)? 45: 45))): date.getMinutes();
- var ampm = hours >= 12 ? 'PM' : 'AM';
- hours = hours % 12;
- hours = hours ? hours : 12; // the hour '0' should be '12'
- minutes = minutes < 10 ? '0' + minutes : minutes;
- var strTime = hours + ':' + minutes + ' ' + ampm;
- } else {
- var strTime = '12:00 AM';
- }
- return strTime;
+ var currentDate = new Date();
+ var currentDay = currentDate.getDate();
+ var currentMonth = currentDate.getMonth()+1;
+ if (currentDay < 10) {
+ currentDay = '0' + currentDay;
+ }
+ if (currentMonth < 10) {
+ currentMonth = '0' + currentMonth;
+ }
+ currentDate = currentMonth + '-' + currentDay;
+ if (currentDate == calendarDate) {
+ var hours = date.getHours();
+ var minutes = (initVal === true)? ((date.getMinutes()<15)? 15: ((date.getMinutes()<30)? 30: ((date.getMinutes()<45)? 45: 45))): date.getMinutes();
+ var ampm = hours >= 12 ? 'PM' : 'AM';
+ hours = hours % 12;
+ hours = hours ? hours : 12; // the hour '0' should be '12'
+ minutes = minutes < 10 ? '0' + minutes : minutes;
+ var strTime = hours + ':' + minutes + ' ' + ampm;
+ } else {
+ var strTime = '12:00 AM';
+ }
+ return strTime;
}
Ext.Ajax.timeout = 4 * 60 * 1000;
var caseSummary = function() {
- var rowModel = grid.getSelectionModel().getSelected();
- if (rowModel) {
- openSummaryWindow(rowModel.data.APP_UID, rowModel.data.DEL_INDEX, action);
- }
- else {
- msgBox(_('ID_INFORMATION'), _('ID_SELECT_ONE_AT_LEAST'));
- }
+ var rowModel = grid.getSelectionModel().getSelected();
+ if (rowModel) {
+ openSummaryWindow(rowModel.data.APP_UID, rowModel.data.DEL_INDEX, action);
+ }
+ else {
+ msgBox(_('ID_INFORMATION'), _('ID_SELECT_ONE_AT_LEAST'));
+ }
};
function caseNotes(){
- var rowModel = grid.getSelectionModel().getSelected();
- if(rowModel){
- var appUid = rowModel.data.APP_UID;
- var delIndex = rowModel.data.DEL_INDEX;
- var caseTitle = (rowModel.data.APP_TITLE) ? rowModel.data.APP_TITLE : rowModel.data.APP_UID;
- var task = (typeof(rowModel.json.TAS_UID) != 'undefined') ? rowModel.json.TAS_UID : '';
- var proid = (typeof(rowModel.json.PRO_UID) != 'undefined') ? rowModel.json.PRO_UID : '';
+ var rowModel = grid.getSelectionModel().getSelected();
+ if(rowModel){
+ var appUid = rowModel.data.APP_UID;
+ var delIndex = rowModel.data.DEL_INDEX;
+ var caseTitle = (rowModel.data.APP_TITLE) ? rowModel.data.APP_TITLE : rowModel.data.APP_UID;
+ var task = (typeof(rowModel.json.TAS_UID) != 'undefined') ? rowModel.json.TAS_UID : '';
+ var proid = (typeof(rowModel.json.PRO_UID) != 'undefined') ? rowModel.json.PRO_UID : '';
- openCaseNotesWindow(appUid, delIndex, true, caseTitle, proid, task);
- }else{
- msgBox(_('ID_INFORMATION'), _('ID_SELECT_ONE_AT_LEAST') );
- }
+ openCaseNotesWindow(appUid, delIndex, true, caseTitle, proid, task);
+ }else{
+ msgBox(_('ID_INFORMATION'), _('ID_SELECT_ONE_AT_LEAST') );
+ }
}
function openCase(){
var rowModel = grid.getSelectionModel().getSelected();
if(rowModel){
- var appUid = rowModel.data.APP_UID;
- var delIndex = rowModel.data.DEL_INDEX;
- var caseTitle = (rowModel.data.APP_TITLE) ? rowModel.data.APP_TITLE : rowModel.data.APP_UID;
+ var appUid = rowModel.data.APP_UID;
+ var delIndex = rowModel.data.DEL_INDEX;
+ var caseTitle = (rowModel.data.APP_TITLE) ? rowModel.data.APP_TITLE : rowModel.data.APP_UID;
- Ext.Msg.show({
- msg: _('ID_OPEN_CASE') + ' ' + caseTitle,
- width:300,
- wait:true,
- waitConfig: {interval:200}
- });
- params = '';
- switch(action){
- case 'to_revise':
- params += 'APP_UID=' + appUid;
- params += '&DEL_INDEX=' + delIndex;
- params += '&to_revise=true';
- requestFile = 'open';
- break;
- case 'sent': // = participated
- params += 'APP_UID=' + appUid;
- params += '&DEL_INDEX=' + delIndex;
- //requestFile = '../cases/cases_Open';
- requestFile = 'open';
- break;
- case 'todo':
- case 'draft':
- case 'paused':
- case 'unassigned':
- default:
- params += 'APP_UID=' + appUid;
- params += '&DEL_INDEX=' + delIndex;
- //requestFile = '../cases/cases_Open';
- requestFile = 'open';
- break;
- }
- try {
+ Ext.Msg.show({
+ msg: _('ID_OPEN_CASE') + ' ' + caseTitle,
+ width:300,
+ wait:true,
+ waitConfig: {interval:200}
+ });
+ params = '';
+ switch(action){
+ case 'to_revise':
+ params += 'APP_UID=' + appUid;
+ params += '&DEL_INDEX=' + delIndex;
+ params += '&to_revise=true';
+ requestFile = 'open';
+ break;
+ case 'sent': // = participated
+ params += 'APP_UID=' + appUid;
+ params += '&DEL_INDEX=' + delIndex;
+ //requestFile = '../cases/cases_Open';
+ requestFile = 'open';
+ break;
+ case 'todo':
+ case 'draft':
+ case 'paused':
+ case 'unassigned':
+ default:
+ params += 'APP_UID=' + appUid;
+ params += '&DEL_INDEX=' + delIndex;
+ //requestFile = '../cases/cases_Open';
+ requestFile = 'open';
+ break;
+ }
try {
- parent._CASE_TITLE = caseTitle;
+ try {
+ parent._CASE_TITLE = caseTitle;
+ }
+ catch (e) {
+ // Nothing to do
+ }
}
catch (e) {
- // Nothing to do
+ // Nothing to do
}
- }
- catch (e) {
- // Nothing to do
- }
- params += '&action=' + action;
- redirect(requestFile + '?' + params);
+ params += '&action=' + action;
+ redirect(requestFile + '?' + params);
} else
- msgBox(_('ID_INFORMATION'), _('ID_SELECT_ONE_AT_LEAST'));
+ msgBox(_('ID_INFORMATION'), _('ID_SELECT_ONE_AT_LEAST'));
}
function jumpToCase(appNumber){
- // Code add by Brayan Pereyra - cochalo
- // This ajax validate the appNumber exists
- Ext.MessageBox.show({ msg: _('ID_PROCESSING'), wait:true,waitConfig: {interval:200} });
- Ext.Ajax.request({
- url: 'cases_Ajax',
- success: function(response) {
- var res = Ext.decode(response.responseText);
- if (res.exists === true) {
- params = 'APP_NUMBER=' + appNumber;
- params += '&action=jump';
- requestFile = '../cases/open';
- redirect(requestFile + '?' + params);
- } else {
- Ext.MessageBox.hide();
- var message = new Array();
- message['CASE_NUMBER'] = appNumber;
- msgBox(_('ID_INPUT_ERROR'), _('ID_CASE_DOES_NOT_EXIST_JS', appNumber), 'error');
- }
- },
- params: {action:'previusJump', appNumber: appNumber}
- });
+ // Code add by Brayan Pereyra - cochalo
+ // This ajax validate the appNumber exists
+ Ext.MessageBox.show({ msg: _('ID_PROCESSING'), wait:true,waitConfig: {interval:200} });
+ Ext.Ajax.request({
+ url: 'cases_Ajax',
+ success: function(response) {
+ var res = Ext.decode(response.responseText);
+ if (res.exists === true) {
+ params = 'APP_NUMBER=' + appNumber;
+ params += '&action=jump';
+ requestFile = '../cases/open';
+ redirect(requestFile + '?' + params);
+ } else {
+ Ext.MessageBox.hide();
+ var message = new Array();
+ message['CASE_NUMBER'] = appNumber;
+ msgBox(_('ID_INPUT_ERROR'), _('ID_CASE_DOES_NOT_EXIST_JS', appNumber), 'error');
+ }
+ },
+ params: {action:'previusJump', appNumber: appNumber}
+ });
}
function deleteCase() {
- var rows = grid.getSelectionModel().getSelections();
- Ext.Ajax.request({
- url : 'casesList_Ajax' ,
- params : {actionAjax : 'verifySession'},
- success: function ( result, request ) {
- var data = Ext.util.JSON.decode(result.responseText);
- if( data.lostSession ) {
- Ext.Msg.show({
- title: _('ID_ERROR'),
- msg: data.message,
- animEl: 'elId',
- icon: Ext.MessageBox.ERROR,
- buttons: Ext.MessageBox.OK,
- fn : function(btn) {
- try
- {
- prnt = parent.parent;
- top.location = top.location;
- }
- catch (err)
- {
- parent.location = parent.location;
- }
+ var rows = grid.getSelectionModel().getSelections();
+ Ext.Ajax.request({
+ url : 'casesList_Ajax' ,
+ params : {actionAjax : 'verifySession'},
+ success: function ( result, request ) {
+ var data = Ext.util.JSON.decode(result.responseText);
+ if( data.lostSession ) {
+ Ext.Msg.show({
+ title: _('ID_ERROR'),
+ msg: data.message,
+ animEl: 'elId',
+ icon: Ext.MessageBox.ERROR,
+ buttons: Ext.MessageBox.OK,
+ fn : function(btn) {
+ try
+ {
+ prnt = parent.parent;
+ top.location = top.location;
+ }
+ catch (err)
+ {
+ parent.location = parent.location;
+ }
+ }
+ });
+ } else {
+ if( rows.length > 0 ) {
+ ids = Array();
+ for(i=0; i 0 ) {
- ids = Array();
- for(i=0; i' + _('ID_PAUSE_CASE_TO_DATE') +' '+date.format('M j, Y')+'?
' - }, - new Ext.form.TimeField({ - id: 'unpauseTime', - fieldLabel: _('ID_UNPAUSE_TIME'), - name: 'unpauseTime', - value: formatAMPM(new Date(), false, date.format('m-d')), - minValue: formatAMPM(new Date(), true, date.format('m-d')), - format: 'h:i A' - }), - { - xtype: 'textarea', - id: 'noteReason', - fieldLabel: _('ID_CASE_PAUSE_REASON'), - name: 'noteReason', - width: 450, - height: 50 - }, - { - id: 'notifyReason', - xtype:'checkbox', - name: 'notifyReason', - hideLabel: true, - boxLabel: _('ID_NOTIFY_USERS_CASE') - } - ], + items: [ + new Ext.FormPanel({ + labelAlign: 'top', + labelWidth: 75, + border: false, + frame: true, + items: [ + { + html: '
' + _('ID_PAUSE_CASE_TO_DATE') +' '+date.format('M j, Y')+'?
' + }, + new Ext.form.TimeField({ + id: 'unpauseTime', + fieldLabel: _('ID_UNPAUSE_TIME'), + name: 'unpauseTime', + value: formatAMPM(new Date(), false, date.format('m-d')), + minValue: formatAMPM(new Date(), true, date.format('m-d')), + format: 'h:i A' + }), + { + xtype: 'textarea', + id: 'noteReason', + fieldLabel: _('ID_CASE_PAUSE_REASON'), + name: 'noteReason', + width: 450, + height: 50 + }, + { + id: 'notifyReason', + xtype:'checkbox', + name: 'notifyReason', + hideLabel: true, + boxLabel: _('ID_NOTIFY_USERS_CASE') + } + ], - buttonAlign: 'center', + buttonAlign: 'center', - buttons: [{ - text: 'Ok', - handler: function(){ - if (Ext.getCmp('noteReason').getValue() != '') { - var noteReasonTxt = _('ID_CASE_PAUSE_LABEL_NOTE') + ' ' + Ext.getCmp('noteReason').getValue(); - } else { - var noteReasonTxt = ''; - } - var notifyReasonVal = Ext.getCmp('notifyReason').getValue() == true ? 1 : 0; + buttons: [{ + text: 'Ok', + handler: function(){ + if (Ext.getCmp('noteReason').getValue() != '') { + var noteReasonTxt = _('ID_CASE_PAUSE_LABEL_NOTE') + ' ' + Ext.getCmp('noteReason').getValue(); + } else { + var noteReasonTxt = ''; + } + var notifyReasonVal = Ext.getCmp('notifyReason').getValue() == true ? 1 : 0; - Ext.MessageBox.show({ msg: _('ID_PROCESSING'), wait:true,waitConfig: {interval:200} }); - Ext.Ajax.request({ - url: 'cases_Ajax', - success: function(response) { - try { - parent.updateCasesView(true); - } - catch (e) { - // Nothing to do - } - Ext.MessageBox.hide(); - try { - parent.updateCasesTree(); - } - catch (e) { - // Nothing to do - } - Ext.MessageBox.hide(); - msgPause.close(); - }, - params: { - action: 'pauseCase', - unpausedate: unpauseDate, - unpauseTime: Ext.getCmp('unpauseTime').getValue(), - APP_UID: rowModel.data.APP_UID, - DEL_INDEX: rowModel.data.DEL_INDEX, - NOTE_REASON: noteReasonTxt, - NOTIFY_PAUSE: notifyReasonVal - } - }); - } - },{ - text: 'Cancel', //COCHATRA - handler: function(){ - msgPause.close(); - } - }] - }) - ] - }); - msgPause.show(this); + Ext.MessageBox.show({ msg: _('ID_PROCESSING'), wait:true,waitConfig: {interval:200} }); + Ext.Ajax.request({ + url: 'cases_Ajax', + success: function(response) { + try { + parent.updateCasesView(true); + } + catch (e) { + // Nothing to do + } + Ext.MessageBox.hide(); + try { + parent.updateCasesTree(); + } + catch (e) { + // Nothing to do + } + Ext.MessageBox.hide(); + msgPause.close(); + }, + params: { + action: 'pauseCase', + unpausedate: unpauseDate, + unpauseTime: Ext.getCmp('unpauseTime').getValue(), + APP_UID: rowModel.data.APP_UID, + DEL_INDEX: rowModel.data.DEL_INDEX, + NOTE_REASON: noteReasonTxt, + NOTIFY_PAUSE: notifyReasonVal + } + }); + } + },{ + text: 'Cancel', //COCHATRA + handler: function(){ + msgPause.close(); + } + }] + }) + ] + }); + msgPause.show(this); - } else { - Ext.Msg.show({ - title:'', - msg: _('ID_NO_SELECTION_WARNING'), - buttons: Ext.Msg.INFO, - fn: function(){}, - animEl: 'elId', - icon: Ext.MessageBox.INFO, - buttons: Ext.MessageBox.OK - }); - } + } else { + Ext.Msg.show({ + title:'', + msg: _('ID_NO_SELECTION_WARNING'), + buttons: Ext.Msg.INFO, + fn: function(){}, + animEl: 'elId', + icon: Ext.MessageBox.INFO, + buttons: Ext.MessageBox.OK + }); + } } function cancelCase(){ - var rows = grid.getSelectionModel().getSelections(); - if( rows.length > 0 ) { - app_uid = Array(); - del_index = Array(); + var rows = grid.getSelectionModel().getSelections(); + if( rows.length > 0 ) { + app_uid = Array(); + del_index = Array(); - for(i=0; i
';
- return summaryIcon;
- };
-
- function renderNote(val,p,r) {
- var pro = r.json.PRO_UID;
- var tas = r.json.TAS_UID;
- var appUid = r.data.APP_UID;
- var delIndex = r.data.DEL_INDEX;
- var title = Ext.util.Format.htmlEncode(r.data.APP_TITLE);
-
- return "![](\"/images/ext/default/s.gif\")
";
- }
-
- //Render Full Name
- full_name = function(v, x, s) {
- if (s.data.USR_UID) {
- return _FNF(s.data.USR_USERNAME, s.data.USR_FIRSTNAME, s.data.USR_LASTNAME);
- }
- else {
- return '[' + _('ID_UNASSIGNED').toUpperCase() + ']';
- }
- };
-
- previous_full_name = function(v, x, s) {
- if (s.data.PREVIOUS_USR_UID) {
- return _FNF(s.data.PREVIOUS_USR_USERNAME, s.data.PREVIOUS_USR_FIRSTNAME, s.data.PREVIOUS_USR_LASTNAME);
- }
- else {
- return '';
- }
- };
-
- for(var i = 0, len = columns.length; i < len; i++){
- var c = columns[i];
- c.renderer = columnRenderer;
- if( c.dataIndex == 'DEL_TASK_DUE_DATE') c.renderer = dueDate;
- if( c.dataIndex == 'APP_UPDATE_DATE') c.renderer = showDate;
- if( c.id == 'deleteLink') c.renderer = deleteLink;
- if( c.id == 'viewLink') c.renderer = viewLink;
- if( c.id == 'unpauseLink') c.renderer = unpauseLink;
- if( c.dataIndex == 'CASE_SUMMARY') c.renderer = renderSummary;
- if( c.dataIndex == 'CASE_NOTES_COUNT') c.renderer = renderNote;
-
- if( c.dataIndex == 'CASE_SUMMARY') c.sortable = false;
- if( c.dataIndex == 'CASE_NOTES_COUNT') c.sortable = false;
-
- //Format the name if is disabled solr, otherwise show without format
- if (solrEnabled == 0) {
- if( c.dataIndex == 'APP_DEL_PREVIOUS_USER') c.renderer = previous_full_name;
- if( c.dataIndex == 'APP_CURRENT_USER') c.renderer = full_name;
+ function dueDate(value, p, r){
+ if (value) {
+ var myDate = convertDate( value );
+ var myColor = (myDate < new Date()) ? " color:red;" : 'color:green;';
+ return String.format("{0}", myDate.dateFormat(FORMATS.casesListDateFormat), myColor );
+ }
+ else {
+ return '';
+ }
}
- c.header = _(c.header);
- }
- //adding the hidden field DEL_INIT_DATE
- readerFields.push ( {name: "DEL_INIT_DATE"});
- readerFields.push ( {name: "APP_UID"});
- readerFields.push ( {name: "DEL_INDEX"});
+ var renderSummary = function (val, p, r) {
+ var summaryIcon = '';
+ return summaryIcon;
+ };
- readerFields.push ( {name: "USR_FIRSTNAME"});
- readerFields.push ( {name: "USR_LASTNAME"});
- readerFields.push ( {name: "USR_USERNAME"});
+ function renderNote(val,p,r) {
+ var pro = r.json.PRO_UID;
+ var tas = r.json.TAS_UID;
+ var appUid = r.data.APP_UID;
+ var delIndex = r.data.DEL_INDEX;
+ var title = Ext.util.Format.htmlEncode(r.data.APP_TITLE);
- for (i=0; i" + _('ID_TOTAL_CASES_REASSIGNED') + ": " + ajaxServerResponse['TOTAL']; + } else { + message = ""; + }; + + if (message!=""){ + Ext.MessageBox.alert( _('ID_STATUS_REASSIGNMENT'), message, '' ); + } + }, + params: { APP_UIDS:ids, data:Ext.util.JSON.encode(sv), selected:true } + }); } - }); - var btnExecReassign = new Ext.Button ({ - text: _('ID_REASSIGN_ALL'), - // text: 'Reassign All', - // text: TRANSLATIONS.LABEL_SELECT_ALL, - handler: function(){ - var rs = storeReassignCases.getModifiedRecords(); - var sv = []; - for(var i = 0; i <= rs.length-1; i++){ - //sv[i]= rs[i].data['name']; - sv[i]= rs[i].data; - } - var gridData = storeReassignCases.getModifiedRecords(); + // Create HttpProxy instance, all CRUD requests will be directed to single proxy url. + if (caseListBuilder) { + var proxyCasesList = new Ext.data.HttpProxy({ + api: { + read : urlProxy + } + }); + } else { + var proxyCasesList = new Ext.data.HttpProxy({ + api: { + read : urlProxy + } + }); + } - Ext.Ajax.request({ - url: 'proxySaveReassignCasesList', - success: function(response) { - newPopUp.hide(); - storeCases.reload(); + // Typical JsonReader with additional meta-data params for defining the core attributes of your json-response + // the readerFields is defined in PHP server side + var readerCasesList = new Ext.data.JsonReader({ + totalProperty: 'totalCount', + successProperty: 'success', + idProperty: 'index', + root: 'data', + messageProperty: 'message' }, - params: { APP_UIDS:ids, data:Ext.util.JSON.encode(sv), selected:false } - }); + readerFields + ); - /* - storeReassignCases.setBaseParam('selected', false); - var result = storeReassignCases.save(); - newPopUp.hide(); - storeCases.reload(); - */ - //storeReassignCases.reload(); - } - }); + // The new DataWriter component. + //currently we are not using this in casesList, but it is here just for complete definition + var writerCasesList = new Ext.data.JsonWriter({ + encode: true, + writeAllFields: true + }); - var ExecReassign = function () { - newPopUp.hide(); - var rs = storeReassignCases.getModifiedRecords(); - - var sv = []; - for(var i = 0; i <= rs.length-1; i++){ - sv[i]= rs[i].data; - } - var gridData = storeReassignCases.getModifiedRecords(); - Ext.MessageBox.show({ msg: _('ID_PROCESSING'), wait:true,waitConfig: {interval:200} }); - Ext.Ajax.request({ - url: 'proxySaveReassignCasesList', - success: function(response) { - Ext.MessageBox.hide(); - storeCases.reload(); - var ajaxServerResponse = Ext.util.JSON.decode(response.responseText); - var count; - var message = ''; - - for (count in ajaxServerResponse) { - if ( ajaxServerResponse[count]['TAS_TITLE'] != undefined ){ - message = message + _('ID_CASE') + ": " + ajaxServerResponse[count]['APP_TITLE'] + " - " + _('ID_REASSIGNED_TO') + ": " + ajaxServerResponse[count]['APP_REASSIGN_USER'] + "
" ; - }; + var proxyReassignCasesList = new Ext.data.HttpProxy({ + api: { + read : 'proxyReassignCasesList' + //destroy : 'proxyReassignCasesList' } + }); - if (ajaxServerResponse['TOTAL']!=undefined&&ajaxServerResponse['TOTAL']!=-1){ - message = message + "
" + _('ID_TOTAL_CASES_REASSIGNED') + ": " + ajaxServerResponse['TOTAL']; - } else { - message = ""; - }; + var readerReassignCasesList = new Ext.data.JsonReader({ + totalProperty: 'totalCount', + successProperty: 'success', + idProperty: 'index', + root: 'data', + messageProperty: 'message' + }, + reassignReaderFields + ); - if (message!=""){ - Ext.MessageBox.alert( _('ID_STATUS_REASSIGNMENT'), message, '' ); + // The new DataWriter component. + //currently we are not using this in casesList, but it is here just for complete definition + var writerReassignCasesList = new Ext.data.JsonWriter({ + encode: true, + writeAllFields: true + }); + + + + // Typical Store collecting the Proxy, Reader and Writer together. + // This is the store for Cases List + storeCases = new Ext.data.Store({ + remoteSort: true, + proxy: proxyCasesList, + reader: readerCasesList, + writer: writerCasesList, // <-- plug a DataWriter into the store just as you would a Reader + autoSave: true, // <-- false would delay executing create, update, destroy requests until specifically told to do so with some [save] buton. + sortInfo:{field: 'APP_CACHE_VIEW.APP_NUMBER', direction: "DESC"}, + listeners: { + load: function(response){ + + if (response.reader.jsonData.result === false) { + PMExt.notify('ERROR', response.reader.jsonData.message); + //PMExt.error + } + }, + exception: function(dp, type, action, options, response, arg) { + responseObject = Ext.util.JSON.decode(response.responseText); + if (typeof(responseObject.error) != 'undefined') { + Ext.Msg.show({ + title: _('ID_ERROR'), + msg: responseObject.error, + fn: function(){parent.parent.location = '../login/login';}, + animEl: 'elId', + icon: Ext.MessageBox.ERROR, + buttons: Ext.MessageBox.OK + }); + } + } } - }, - params: { APP_UIDS:ids, data:Ext.util.JSON.encode(sv), selected:true } }); - } - - // Create HttpProxy instance, all CRUD requests will be directed to single proxy url. - if (caseListBuilder) { - var proxyCasesList = new Ext.data.HttpProxy({ - api: { - read : urlProxy - } + storeReassignCases = new Ext.data.Store({ + remoteSort: false, + proxy : proxyReassignCasesList, + reader: readerReassignCasesList + //writer: writerReassignCasesList, // <-- plug a DataWriter into the store just as you would a Reader + //autoSave: false // <-- false would delay executing create, update, destroy requests until specifically told to do so with some [save] buton. }); - } else { - var proxyCasesList = new Ext.data.HttpProxy({ - api: { - read : urlProxy - } + + //Layout Resizing + /*----------------------------------********---------------------------------*/ + if (typeof valueFilterStatus != 'undefined') { + if (valueFilterStatus != '') { + storeCases.setBaseParam('filterStatus', valueFilterStatus); + } + } + /*----------------------------------********---------------------------------*/ + storeCases.on('load',function(){var viewport = Ext.getCmp("viewportcases");viewport.doLayout();}) + + // create the Data Store for processes + var storeProcesses = new Ext.data.JsonStore({ + root: 'data', + totalProperty: 'totalCount', + idProperty: 'index', + remoteSort: true, + fields: [ + 'PRO_UID', 'APP_PRO_TITLE' + ], + proxy: new Ext.data.HttpProxy({ + url: 'proxyProcessList?t=new' + }) }); - } + storeProcesses.setDefaultSort('APP_PRO_TITLE', 'asc'); - // Typical JsonReader with additional meta-data params for defining the core attributes of your json-response - // the readerFields is defined in PHP server side - var readerCasesList = new Ext.data.JsonReader({ - totalProperty: 'totalCount', - successProperty: 'success', - idProperty: 'index', - root: 'data', - messageProperty: 'message' - }, - readerFields - ); + // creating the button for filters + var btnRead = new Ext.Button ({ + id: 'read', + text: _('ID_OPT_READ'), + enableToggle: true, + toggleHandler: onItemToggle, + allowDepress: false, + pressed: false + }); - // The new DataWriter component. - //currently we are not using this in casesList, but it is here just for complete definition - var writerCasesList = new Ext.data.JsonWriter({ - encode: true, - writeAllFields: true - }); + var btnUnread = new Ext.Button ({ + id: 'unread', + text: _('ID_OPT_UNREAD'), + enableToggle: true, + toggleHandler: onItemToggle, + allowDepress: false, + pressed: false + }); - var proxyReassignCasesList = new Ext.data.HttpProxy({ - api: { - read : 'proxyReassignCasesList' - //destroy : 'proxyReassignCasesList' - } - }); + var btnAll = new Ext.Button ({ + id: 'all', + text: _('ID_OPT_ALL'), + enableToggle: true, + toggleHandler: onItemToggle, + allowDepress: false, + pressed: true + }); - var readerReassignCasesList = new Ext.data.JsonReader({ - totalProperty: 'totalCount', - successProperty: 'success', - idProperty: 'index', - root: 'data', - messageProperty: 'message' - }, - reassignReaderFields - ); - - // The new DataWriter component. - //currently we are not using this in casesList, but it is here just for complete definition - var writerReassignCasesList = new Ext.data.JsonWriter({ - encode: true, - writeAllFields: true - }); - - - - // Typical Store collecting the Proxy, Reader and Writer together. - // This is the store for Cases List - storeCases = new Ext.data.Store({ - remoteSort: true, - proxy: proxyCasesList, - reader: readerCasesList, - writer: writerCasesList, // <-- plug a DataWriter into the store just as you would a Reader - autoSave: true, // <-- false would delay executing create, update, destroy requests until specifically told to do so with some [save] buton. - sortInfo:{field: 'APP_CACHE_VIEW.APP_NUMBER', direction: "DESC"}, - listeners: { - load: function(response){ - - if (response.reader.jsonData.result === false) { - PMExt.notify('ERROR', response.reader.jsonData.message); - //PMExt.error - } - }, - exception: function(dp, type, action, options, response, arg) { - responseObject = Ext.util.JSON.decode(response.responseText); - if (typeof(responseObject.error) != 'undefined') { - Ext.Msg.show({ - title: _('ID_ERROR'), - msg: responseObject.error, - fn: function(){parent.parent.location = '../login/login';}, - animEl: 'elId', - icon: Ext.MessageBox.ERROR, - buttons: Ext.MessageBox.OK - }); - } - } - } - }); - - storeReassignCases = new Ext.data.Store({ - remoteSort: false, - proxy : proxyReassignCasesList, - reader: readerReassignCasesList - //writer: writerReassignCasesList, // <-- plug a DataWriter into the store just as you would a Reader - //autoSave: false // <-- false would delay executing create, update, destroy requests until specifically told to do so with some [save] buton. - }); - - //Layout Resizing - storeCases.on('load',function(){var viewport = Ext.getCmp("viewportcases");viewport.doLayout();}) - - // create the Data Store for processes - var storeProcesses = new Ext.data.JsonStore({ - root: 'data', - totalProperty: 'totalCount', - idProperty: 'index', - remoteSort: true, - fields: [ - 'PRO_UID', 'APP_PRO_TITLE' - ], - proxy: new Ext.data.HttpProxy({ - url: 'proxyProcessList?t=new' - }) - }); - storeProcesses.setDefaultSort('APP_PRO_TITLE', 'asc'); - - // creating the button for filters - var btnRead = new Ext.Button ({ - id: 'read', - text: _('ID_OPT_READ'), - enableToggle: true, - toggleHandler: onItemToggle, - allowDepress: false, - pressed: false - }); - - var btnUnread = new Ext.Button ({ - id: 'unread', - text: _('ID_OPT_UNREAD'), - enableToggle: true, - toggleHandler: onItemToggle, - allowDepress: false, - pressed: false - }); - - var btnAll = new Ext.Button ({ - id: 'all', - text: _('ID_OPT_ALL'), - enableToggle: true, - toggleHandler: onItemToggle, - allowDepress: false, - pressed: true - }); - - var btnStarted = new Ext.Button ({ - id: 'started', + var btnStarted = new Ext.Button ({ + id: 'started', // text: 'started by me', - text: _('ID_OPT_STARTED'), - enableToggle: true, - toggleHandler: onItemToggle, - allowDepress: true, - pressed: false - }); + text: _('ID_OPT_STARTED'), + enableToggle: true, + toggleHandler: onItemToggle, + allowDepress: true, + pressed: false + }); - var btnCompleted = new Ext.Button ({ - id: 'completed', + var btnCompleted = new Ext.Button ({ + id: 'completed', // text: 'Completed by me', - text: _('ID_OPT_COMPLETED'), - enableToggle: true, - toggleHandler: onItemToggle, - allowDepress: true, - pressed: false - }); + text: _('ID_OPT_COMPLETED'), + enableToggle: true, + toggleHandler: onItemToggle, + allowDepress: true, + pressed: false + }); - // ComboBox creation processValues - var resultTpl = new Ext.XTemplate( - '
',
- ' {APP_PRO_TITLE}',
- '
',
+ ' {APP_PRO_TITLE}',
+ '
-
-
-
@@ -423,7 +409,7 @@
-
+
+
+
+
diff --git a/workflow/public_html/css/general.css b/workflow/public_html/css/general.css
index fe3b6f558..8abe85429 100644
--- a/workflow/public_html/css/general.css
+++ b/workflow/public_html/css/general.css
@@ -659,20 +659,20 @@ img#topright { top:0; right:0; }
stroke-width: 0;
}
- .tooltip { /* NEW */
- background: #eee; /* NEW */
- box-shadow: 0 0 5px #999999; /* NEW */
- color: #333; /* NEW */
- display: none; /* NEW */
- font-size: 12px; /* NEW */
- left: 110px; /* NEW */
- padding: 10px; /* NEW */
- position: absolute; /* NEW */
- text-align: center; /* NEW */
- top: 85px; /* NEW */
- width: 80px; /* NEW */
- z-index: 10; /* NEW */
- }
+ /*.tooltip { /* NEW */
+ /* background: #eee; /* NEW */
+ /* box-shadow: 0 0 5px #999999; /* NEW */
+ /* color: #333; /* NEW */
+ /* display: none; /* NEW */
+ /* font-size: 12px; /* NEW */
+ /* left: 110px; /* NEW */
+ /* padding: 10px; /* NEW */
+ /* position: absolute; /* NEW */
+ /* text-align: center; /* NEW */
+ /* top: 85px; /* NEW */
+ /* width: 80px; /* NEW */
+ /* z-index: 10; /* NEW */
+ /*}*/
.letter{
background-image: url("../images/logo-proces-marker.png");
diff --git a/workflow/public_html/css/sb-admin-2.css b/workflow/public_html/css/sb-admin-2.css
index 5a446c188..1327117d2 100644
--- a/workflow/public_html/css/sb-admin-2.css
+++ b/workflow/public_html/css/sb-admin-2.css
@@ -354,10 +354,10 @@ table.dataTable thead .sorting:after {
color: #606368;
}
-.panel-green a:hover {
+/*.panel-green a:hover {
color: #1fbc99;
text-decoration: none;
-}
+}*/
.panel-red {
border-color: #ddd;
@@ -545,6 +545,10 @@ table.dataTable thead .sorting:after {
margin: 11px 17px 0 0;
}
+.dashboard-right {
+ margin: 5px;
+}
+
.dashboard-right h5{
margin: 20px 12px 0 0;
}
@@ -581,8 +585,8 @@ table.dataTable thead .sorting:after {
margin-bottom: 45px;
}
-.panel-green:hover, .panel-red:hover, .panel-high:hover, .panel-low:hover{
- box-shadow:0px 3px 2px #dfdfdf;
+.panel-green:hover, .panel-red:hover, .panel-high:hover, .panel-low, .panel-status:hover{
+ box-shadow:0px 3px 2px #dfdfdf;
}
.small{
@@ -807,3 +811,15 @@ table.dataTable thead .sorting:after {
.bottom{
margin-bottom: 30px;
}
+
+.tooltip > .tooltip-inner {
+ line-height: 1;
+ text-align: center;
+ color: #fff;
+ width: 150px;
+ padding: 15px;
+ font-size: 12px;
+ background: rgba(0, 0, 0, 0.7);
+ border-radius: 8px;
+ pointer-events: none;
+}
+
+
+
+
+
+ -
+
+
+
+
+