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

Resolving conflicts

Browse Source
This commit is contained in:
jennylee
2015-03-26 18:14:51 -04:00
parent cff0e2c6e1
commit f6788b35d5
15 changed files with 4253 additions and 3231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
workflow/engine/bin/cron_single.php
View File

@@ -352,6 +352,9 @@ Bootstrap::registerClass('wsResponse', PATH_HOME . "engine/classes/clas
Bootstrap::registerClass("PMLicensedFeatures", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.licensedFeatures.php");
Bootstrap::registerClass("AddonsManagerPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AddonsManagerPeer.php");
/*----------------------------------********---------------------------------*/
Bootstrap::registerClass('dashboards', PATH_HOME . "engine/classes/class.dashboards.php");
/*----------------------------------********---------------------------------*/
$arrayClass = array("EmailServer", "ListInbox", "ListParticipatedHistory");
@@ -365,14 +368,33 @@ foreach ($arrayClass as $value) {
G::LoadClass("serverConfiguration");
G::LoadClass("dates"); //Load Criteria
/*----------------------------------********---------------------------------*/
global $dateInit;
global $dateFinish;
/*----------------------------------********---------------------------------*/
if (!defined('SYS_SYS')) {
$sObject = $argv[1];
$sNow = $argv[2];
$dateSystem = $argv[3];
/*----------------------------------********---------------------------------*/
$dateInit = null;
$dateFinish = null;
/*----------------------------------********---------------------------------*/
$sFilter = '';
for ($i = 4; $i <= count($argv) - 1; $i++) {
/*----------------------------------********---------------------------------*/
if (strpos($argv[$i], "+init-date") !== false) {
$dateInit = substr($argv[$i],10);
} else if (strpos($argv[$i], "+finish-date") !== false) {
$dateFinish = substr($argv[$i], 12);
} else {
/*----------------------------------********---------------------------------*/
$sFilter .= ' ' . $argv[$i];
/*----------------------------------********---------------------------------*/
}
/*----------------------------------********---------------------------------*/
}
$oDirectory = dir(PATH_DB);
@@ -470,7 +492,7 @@ if (!defined('SYS_SYS')) {
} catch (Exception $e) {
echo $e->getMessage();
eprintln("Probelm in workspace: " . $sObject . " it was omitted.", "red");
eprintln("Problem in workspace: " . $sObject . " it was omitted.", "red");
}
eprintln();
@@ -502,11 +524,18 @@ function processWorkspace()
resendEmails();
unpauseApplications();
calculateDuration();
/*----------------------------------********---------------------------------*/
calculateAppDuration();
/*----------------------------------********---------------------------------*/
executeEvents($sLastExecution);
executeScheduledCases();
executeUpdateAppTitle();
executeCaseSelfService();
executePlugins();
/*----------------------------------********---------------------------------*/
fillReportByUser();
fillReportByProcess();
/*----------------------------------********---------------------------------*/
} catch (Exception $oError) {
saveLog("main", "error", "Error processing workspace : " . $oError->getMessage() . "\n");
}
@@ -696,6 +725,31 @@ function calculateDuration()
}
}
/*----------------------------------********---------------------------------*/
function calculateAppDuration()
{
global $sFilter;
if ($sFilter != '' && strpos($sFilter, 'calculateapp') === false) {
return false;
}
setExecutionMessage("Calculating Duration by Application");
try {
$oApplication = new Application();
$oApplication->calculateAppDuration(1);
setExecutionResultMessage('DONE');
saveLog('calculateDurationByApp', 'action', 'Calculating Duration by Application');
} catch (Exception $oError) {
setExecutionResultMessage('WITH ERRORS', 'error');
eprintln(" '-".$oError->getMessage(), 'red');
saveLog('calculateDurationByApp', 'error', 'Error Calculating Duration: ' . $oError->getMessage());
}
}
/*----------------------------------********---------------------------------*/
function executeEvents($sLastExecution, $sNow=null)
{
global $sFilter;
@@ -1038,3 +1092,66 @@ function setExecutionResultMessage($m, $t='')
eprintln("[$m]", $c);
}
/*----------------------------------********---------------------------------*/
function fillReportByUser ()
{
try {
global $sFilter;
global $dateInit;
global $dateFinish;
if (strpos($sFilter, 'report_by_user') === false) {
return false;
}
if ($dateInit == null) {
eprintln("You must enter the starting date.", "red");
eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red");
return false;
}
$dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s");
$appcv = new AppCacheView();
$appcv->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP );
setExecutionMessage("Calculating data to fill the 'User Reporting'...");
$appcv->fillReportByUser($dateInit, $dateFinish);
setExecutionResultMessage("DONE");
} catch (Exception $e) {
setExecutionResultMessage("WITH ERRORS", "error");
eprintln(" '-" . $e->getMessage(), "red");
saveLog("fillReportByUser", "error", "Error in fill report by user: " . $e->getMessage());
}
}
function fillReportByProcess ()
{
try {
global $sFilter;
global $dateInit;
global $dateFinish;
if (strpos($sFilter, 'report_by_process') === false) {
return false;
}
if ($dateInit == null) {
eprintln("You must enter the starting date.", "red");
eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red");
return false;
}
$dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s");
$appcv = new AppCacheView();
$appcv->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP );
setExecutionMessage("Calculating data to fill the 'Process Reporting'...");
$appcv->fillReportByProcess($dateInit, $dateFinish);
setExecutionResultMessage("DONE");
} catch (Exception $e) {
setExecutionResultMessage("WITH ERRORS", "error");
eprintln(" '-" . $e->getMessage(), "red");
saveLog("fillReportByProcess", "error", "Error in fill report by process: " . $e->getMessage());
}
}
/*----------------------------------********---------------------------------*/

250
workflow/engine/classes/class.calendar.php
View File

@@ -414,7 +414,7 @@ class calendar extends CalendarDefinition
$hoursDuration -= (float)($secondRes/3600);
//$dataLog[] = (float)($secondRes/3600);
} else {
$newDate = date("Y-m-d H:i:s", strtotime("+" . round(((float)($hoursDuration)) * 3600) . " seconds", strtotime($newDate)));
$newDate = date('Y-m-d H:i:s', strtotime('+' . (((float)$hoursDuration)*3600) . ' seconds', strtotime($newDate)));
//$dataLog[] = (float)($hoursDuration);
$hoursDuration = 0;
}
@@ -796,5 +796,253 @@ class calendar extends CalendarDefinition
return $return;
}
/**************SLA classes***************/
public function dashCalculateDate ($iniDate, $duration, $formatDuration, $calendarData = array())
{
if ( G::toUpper($formatDuration) == 'DAYS' ) {
$duration = $duration*$calendarData['HOURS_FOR_DAY'];
}
$hoursDuration = (float)$duration;
$newDate = $iniDate;
while ($hoursDuration > 0) {
$newDate = $this->dashGetIniDate($newDate, $calendarData);
$rangeWorkHour = $this->dashGetRangeWorkHours($newDate, $calendarData['BUSINESS_DAY']);
$onlyDate = (date('Y-m-d',strtotime($newDate))) . ' ' . $rangeWorkHour['END'];
if ( (((float)$hoursDuration) >= ((float)$rangeWorkHour['TOTAL'])) ||
((strtotime($onlyDate) - strtotime($newDate)) < (((float)$hoursDuration)*3600))
) {
$secondRes = (float)(strtotime($onlyDate) - strtotime($newDate));
$newDate = $onlyDate;
$hoursDuration -= (float)($secondRes/3600);
} else {
$newDate = date('Y-m-d H:i:s', strtotime('+' . (((float)$hoursDuration)*3600) . ' seconds', strtotime($newDate)));
$hoursDuration = 0;
}
}
return $newDate;
}
//Calculate the duration betwen two dates with a calendar
public function dashCalculateDurationWithCalendar ($iniDate, $finDate = null, $calendarData = array())
{
if ((is_null($finDate)) || ($finDate == '')) {
$finDate = date('Y-m-d H:i:s');
}
$secondDuration = 0.00;
if ( (strtotime($iniDate)) < (strtotime($finDate)) ) {
$timeIniDate = strtotime($iniDate);
$timeFinDate = strtotime($finDate);
} elseif ( (strtotime($finDate)) < (strtotime($iniDate)) ) {
$timeIniDate = strtotime($finDate);
$timeFinDate = strtotime($iniDate);
$auxDate = $iniDate;
$iniDate = $finDate;
$finDate = $auxDate;
} else {
return $secondDuration;
}
$finDate = $this->dashGetIniDate($finDate, $calendarData);
$newDate = $iniDate;
while ($timeIniDate < $timeFinDate) {
$newDate = $this->dashGetIniDate($newDate, $calendarData);
$rangeWorkHour = $this->dashGetRangeWorkHours($newDate, $calendarData['BUSINESS_DAY']);
$onlyDate = (date('Y-m-d',strtotime($newDate))) . ' ' . $rangeWorkHour['END'];
if ( (strtotime($finDate)) < (strtotime($onlyDate)) ) {
$secondRes = ( ((float)strtotime($finDate)) - ((float)strtotime($newDate)) );
$timeIniDate = strtotime($finDate);
$secondDuration += (float)$secondRes;
} else {
$secondRes = ( ((float)strtotime($onlyDate)) - ((float)strtotime($newDate)) );
$newDate = $onlyDate;
$timeIniDate = strtotime($onlyDate);
$secondDuration += (float)$secondRes;
}
}
return $secondDuration;
}
public function dashGetIniDate ($iniDate, $calendarData = array())
{
$flagIniDate = true;
while ($flagIniDate) {
// 1 if it's a work day
$weekDay = date('w',strtotime($iniDate));
if ( !(in_array($weekDay, $calendarData['CALENDAR_WORK_DAYS_A'])) ) {
$iniDate = date('Y-m-d'.' 00:00:00' , strtotime('+1 day', strtotime($iniDate)));
continue;
}
// 2 if it's a holiday
$iniDateHolidayDay = $this->dashIs_holiday($iniDate, $calendarData['HOLIDAY']);
if ($iniDateHolidayDay) {
$iniDate = date('Y-m-d'.' 00:00:00' , strtotime('+1 day', strtotime($iniDate)));
continue;
}
// 3 if it's work time
$workHours = $this->dashNextWorkHours($iniDate, $weekDay, $calendarData['BUSINESS_DAY']);
if ( !($workHours['STATUS']) ) {
$iniDate = date('Y-m-d'.' 00:00:00' , strtotime('+1 day', strtotime($iniDate)));
continue;
} else {
$iniDate = $workHours['DATE'];
}
$flagIniDate = false;
}
return $iniDate;
}
public function dashNextWorkHours ($date, $weekDay, $workHours = array())
{
$auxIniDate = explode(' ', $date);
$timeDate = $auxIniDate['1'];
$timeDate = (float)str_replace(':', '', ((strlen($timeDate) == 8) ? $timeDate : $timeDate.':00') );
$nextWorkHours = array();
$workHoursDay = array();
$tempWorkHoursDay = array();
foreach ($workHours as $value) {
if ($value['CALENDAR_BUSINESS_DAY'] == $weekDay) {
$rangeWorkHour = array();
$timeStart = $value['CALENDAR_BUSINESS_START'];
$timeEnd = $value['CALENDAR_BUSINESS_END'];
$rangeWorkHour['START'] = ((strlen($timeStart) == 8) ? $timeStart : $timeStart.':00');
$rangeWorkHour['END'] = ((strlen($timeEnd) == 8) ? $timeEnd : $timeEnd.':00');
$workHoursDay[] = $rangeWorkHour;
}
if ($value['CALENDAR_BUSINESS_DAY'] == '7') {
$rangeWorkHour = array();
$timeStart = $value['CALENDAR_BUSINESS_START'];
$timeEnd = $value['CALENDAR_BUSINESS_END'];
$rangeWorkHour['START'] = ((strlen($timeStart) == 8) ? $timeStart : $timeStart.':00');
$rangeWorkHour['END'] = ((strlen($timeEnd) == 8) ? $timeEnd : $timeEnd.':00');
$tempWorkHoursDay[] = $rangeWorkHour;
}
}
if ( !(count($workHoursDay)) ) {
$workHoursDay = $tempWorkHoursDay;
}
$countHours = count($workHoursDay);
if ($countHours) {
for ($i = 1; $i < $countHours; $i++) {
for ($j = 0; $j < $countHours-$i; $j++) {
$dataft = (float)str_replace(':', '', $workHoursDay[$j]['START']);
$datasc = (float)str_replace(':', '', $workHoursDay[$j+1]['END']);
if ($dataft > $datasc) {
$aux = $workHoursDay[$j+1];
$workHoursDay[$j+1] = $workHoursDay[$j];
$workHoursDay[$j] = $aux;
}
}
}
foreach ($workHoursDay as $value) {
$iniTime = (float)str_replace(':', '', ((strlen($value['START']) == 8) ? $value['START'] : $value['START'].':00'));
$finTime = (float)str_replace(':', '', ((strlen($value['END']) == 8) ? $value['END'] : $value['END'].':00'));
if ( $timeDate <= $iniTime ) {
$nextWorkHours['STATUS'] = true;
$nextWorkHours['DATE'] = $auxIniDate['0'] . ' ' . ((strlen($value['START']) == 8) ? $value['START'] : $value['START'].':00');
return $nextWorkHours;
} elseif ( ($iniTime <= $timeDate) && ($timeDate < $finTime) ) {
$nextWorkHours['STATUS'] = true;
$nextWorkHours['DATE'] = $date;
return $nextWorkHours;
}
}
}
$nextWorkHours['STATUS'] = false;
return $nextWorkHours;
}
public function dashIs_holiday ($date, $holidays = array())
{
$auxIniDate = explode(' ', $date);
$iniDate = $auxIniDate['0'];
$iniDate = strtotime($iniDate);
foreach ($holidays as $value) {
$holidayStartDate = strtotime(date('Y-m-d',strtotime($value['CALENDAR_HOLIDAY_START'])));
$holidayEndDate = strtotime(date('Y-m-d',strtotime($value['CALENDAR_HOLIDAY_END'])));
if ( ($holidayStartDate <= $iniDate) && ($iniDate <= $holidayEndDate) ) {
return true;
}
}
return false;
}
public function dashGetRangeWorkHours ($date, $workHours)
{
$auxIniDate = explode(' ', $date);
$timeDate = $auxIniDate['1'];
$timeDate = (float)str_replace(':', '', ((strlen($timeDate) == 8) ? $timeDate : $timeDate.':00') );
$weekDay = date('w',strtotime($date));
$workHoursDay = array();
$tempWorkHoursDay = array();
foreach ($workHours as $value) {
if ($value['CALENDAR_BUSINESS_DAY'] == $weekDay) {
$rangeWorkHour = array();
$timeStart = $value['CALENDAR_BUSINESS_START'];
$timeEnd = $value['CALENDAR_BUSINESS_END'];
$rangeWorkHour['START'] = ((strlen($timeStart) == 8) ? $timeStart : $timeStart.':00');
$rangeWorkHour['END'] = ((strlen($timeEnd) == 8) ? $timeEnd : $timeEnd.':00');
$workHoursDay[] = $rangeWorkHour;
}
if ($value['CALENDAR_BUSINESS_DAY'] == '7') {
$rangeWorkHour = array();
$timeStart = $value['CALENDAR_BUSINESS_START'];
$timeEnd = $value['CALENDAR_BUSINESS_END'];
$rangeWorkHour['START'] = ((strlen($timeStart) == 8) ? $timeStart : $timeStart.':00');
$rangeWorkHour['END'] = ((strlen($timeEnd) == 8) ? $timeEnd : $timeEnd.':00');
$tempWorkHoursDay[] = $rangeWorkHour;
}
}
if ( !(count($workHoursDay)) ) {
$workHoursDay = $tempWorkHoursDay;
}
foreach ($workHoursDay as $value) {
$iniTime = (float)str_replace(':', '', $value['START']);
$finTime = (float)str_replace(':', '', $value['END']);
if ( ($iniTime <= $timeDate) && ($timeDate <= $finTime) ) {
//pr($finTime .' menos '.$iniTime .' = '.($finTime-$iniTime));
$value['TOTAL'] = (($finTime-$iniTime)/10000);
return $value;
}
}
return false;
}
}
?>

63
workflow/engine/classes/model/AppCacheView.php
View File

@@ -1792,5 +1792,68 @@ class AppCacheView extends BaseAppCacheView
$criteria->addSelectColumn(AppCacheViewPeer::APP_OVERDUE_PERCENTAGE);
return $criteria;
}
/*----------------------------------********---------------------------------*/
function fillReportByUser ()
{
try {
global $sFilter;
global $dateInit;
global $dateFinish;
if (strpos($sFilter, 'report_by_user') === false) {
return false;
}
if ($dateInit == null) {
eprintln("You must enter the starting date.", "red");
eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red");
return false;
}
$dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s");
$appcv = new AppCacheView();
$appcv->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP );
setExecutionMessage("Calculating data to fill the 'User Reporting'...");
$appcv->fillReportByUser($dateInit, $dateFinish);
setExecutionResultMessage("DONE");
} catch (Exception $e) {
setExecutionResultMessage("WITH ERRORS", "error");
eprintln(" '-" . $e->getMessage(), "red");
saveLog("fillReportByUser", "error", "Error in fill report by user: " . $e->getMessage());
}
}
function fillReportByProcess ()
{
try {
global $sFilter;
global $dateInit;
global $dateFinish;
if (strpos($sFilter, 'report_by_process') === false) {
return false;
}
if ($dateInit == null) {
eprintln("You must enter the starting date.", "red");
eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red");
return false;
}
$dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s");
$appcv = new AppCacheView();
$appcv->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP );
setExecutionMessage("Calculating data to fill the 'Process Reporting'...");
$appcv->fillReportByProcess($dateInit, $dateFinish);
setExecutionResultMessage("DONE");
} catch (Exception $e) {
setExecutionResultMessage("WITH ERRORS", "error");
eprintln(" '-" . $e->getMessage(), "red");
saveLog("fillReportByProcess", "error", "Error in fill report by process: " . $e->getMessage());
}
}
/*----------------------------------********---------------------------------*/
}

83
workflow/engine/classes/model/AppDelegation.php
View File

@@ -134,10 +134,12 @@ class AppDelegation extends BaseAppDelegation
//The function return an array now. By JHL
$delTaskDueDate = $this->calculateDueDate( $sNextTasParam );
$this->setDelTaskDueDate( $delTaskDueDate['DUE_DATE'] ); // Due date formatted
//$this->setDelTaskDueDate( $delTaskDueDate['DUE_DATE'] ); // Due date formatted
$this->setDelTaskDueDate( $delTaskDueDate );
if ((defined( "DEBUG_CALENDAR_LOG" )) && (DEBUG_CALENDAR_LOG)) {
$this->setDelData( $delTaskDueDate['DUE_DATE_LOG'] ); // Log of actions made by Calendar Engine
//$this->setDelData( $delTaskDueDate['DUE_DATE_LOG'] ); // Log of actions made by Calendar Engine
$this->setDelData( $delTaskDueDate );
} else {
$this->setDelData( '' );
}
@@ -151,6 +153,8 @@ class AppDelegation extends BaseAppDelegation
if ($this->validate()) {
try {
$res = $this->save();
$inbox = new ListInbox();
$inbox->newRow($this->toArray(BasePeer::TYPE_FIELDNAME), $delPreviusUsrUid);
} catch (PropelException $e) {
throw ($e);
}
@@ -175,19 +179,6 @@ class AppDelegation extends BaseAppDelegation
$data->USR_UID = $sUsrUid;
$oPluginRegistry = &PMPluginRegistry::getSingleton();
$oPluginRegistry->executeTriggers( PM_CREATE_NEW_DELEGATION, $data );
/*----------------------------------********---------------------------------*/
// this section evaluates the actions by email trigger execution please
// modify this section carefully, the if evaluation checks if the license has been
// activated in order to send the mail according to the configuration table
if (PMLicensedFeatures
::getSingleton()
->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) {
G::LoadClass('actionsByEmail');
$actionsByEmail = new actionsByEmailClass();
$actionsByEmail->sendActionsByEmail($data);
}
/*----------------------------------********---------------------------------*/
}
return $delIndex;
@@ -233,10 +224,6 @@ class AppDelegation extends BaseAppDelegation
$c->addSelectColumn( AppDelegationPeer::PRO_UID );
$c->addSelectColumn( AppDelegationPeer::TAS_UID );
$c->addSelectColumn( AppDelegationPeer::USR_UID );
$c->addSelectColumn( AppDelegationPeer::DEL_DELEGATE_DATE );
$c->addSelectColumn( AppDelegationPeer::DEL_INIT_DATE );
$c->addSelectColumn( AppDelegationPeer::DEL_TASK_DUE_DATE );
$c->addSelectColumn( AppDelegationPeer::DEL_FINISH_DATE );
$c->add( AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN' );
$c->add( AppDelegationPeer::APP_UID, $AppUid );
@@ -251,12 +238,6 @@ class AppDelegation extends BaseAppDelegation
$case = array();
$case['TAS_UID'] = $row['TAS_UID'];
$case['USR_UID'] = $row['USR_UID'];
$case['DEL_INDEX'] = $row['DEL_INDEX'];
$case['TAS_UID'] = $row['TAS_UID'];
$case['DEL_DELEGATE_DATE'] = $row['DEL_DELEGATE_DATE'];
$case['DEL_INIT_DATE'] = $row['DEL_INIT_DATE'];
$case['DEL_TASK_DUE_DATE'] = $row['DEL_TASK_DUE_DATE'];
$case['DEL_FINISH_DATE'] = $row['DEL_FINISH_DATE'];
$aCases[] = $case;
$rs->next();
$row = $rs->getRow();
@@ -357,12 +338,12 @@ class AppDelegation extends BaseAppDelegation
if ($calendar->pmCalendarUid == '') {
$calendar->getCalendar(null, $task->getProUid(), $aData['TAS_UID']);
$calendar->getCalendarData();
$calData = $calendar->getCalendarData();
}
$iDueDate = $calendar->calculateDate( $this->getDelDelegateDate(), $aData['TAS_DURATION'], $aData['TAS_TIMEUNIT'] //hours or days, ( we only accept this two types or maybe weeks
);
/*$iDueDate = $calendar->calculateDate( $this->getDelDelegateDate(), $aData['TAS_DURATION'], $aData['TAS_TIMEUNIT'] //hours or days, ( we only accept this two types or maybe weeks
);*/
$iDueDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), $aData['TAS_DURATION'], $aData['TAS_TIMEUNIT'], $calData);
return $iDueDate;
}
@@ -417,6 +398,9 @@ class AppDelegation extends BaseAppDelegation
$c->clearSelectColumns();
$c->addSelectColumn( AppDelegationPeer::APP_UID );
$c->addSelectColumn( AppDelegationPeer::DEL_INDEX );
$c->addSelectColumn( AppDelegationPeer::USR_UID);
$c->addSelectColumn( AppDelegationPeer::PRO_UID);
$c->addSelectColumn( AppDelegationPeer::TAS_UID);
$c->addSelectColumn( AppDelegationPeer::DEL_DELEGATE_DATE );
$c->addSelectColumn( AppDelegationPeer::DEL_INIT_DATE );
$c->addSelectColumn( AppDelegationPeer::DEL_TASK_DUE_DATE );
@@ -450,10 +434,12 @@ class AppDelegation extends BaseAppDelegation
//print "<table colspacing='2' border='1'>";
//print "<tr><td>iDelegateDate </td><td>iInitDate </td><td>iDueDate </td><td>iFinishDate </td><td>isStarted </td><td>isFinished </td><td>isDelayed </td><td>queueDuration </td><td>delDuration </td><td>delayDuration</td></tr>";
$calendar = new calendar();
$now = strtotime( 'now' );
while (is_array( $row )) {
$fTaskDuration = $row['TAS_DURATION'];
$fTaskDurationUnit = $row['TAS_TIMEUNIT'];
$iDelegateDate = strtotime( $row['DEL_DELEGATE_DATE'] );
$iInitDate = strtotime( $row['DEL_INIT_DATE'] );
$iDueDate = strtotime( $row['DEL_TASK_DUE_DATE'] );
@@ -468,6 +454,13 @@ class AppDelegation extends BaseAppDelegation
//get the object,
$oAppDel = AppDelegationPeer::retrieveByPk( $row['APP_UID'], $row['DEL_INDEX'] );
//getting the calendar
$calendar->getCalendar($row['USR_UID'], $row['PRO_UID'], $row['TAS_UID']);
$calData = $calendar->getCalendarData();
//Recalculating DueDate with the user calendar if it exist. It allways will take the derivation date like initial date.
$iDueDate = $calendar->dashCalculateDate($row['DEL_DELEGATE_DATE'], $fTaskDuration, $fTaskDurationUnit, $calData);
//if the task is not started
if ($isStarted == 0) {
if ($row['DEL_INIT_DATE'] != null && $row['DEL_INIT_DATE'] != '') {
@@ -480,8 +473,11 @@ class AppDelegation extends BaseAppDelegation
$oAppDel->setDelQueueDuration( $queueDuration );
//we are putting negative number if the task is not delayed, and positive number for the time the task is delayed
$delayDuration = $this->getDiffDate( $now, $iDueDate );
//$delayDuration = $this->getDiffDate( $now, $iDueDate );
$delayDuration = $calendar->dashCalculateDurationWithCalendar( $iDueDate, date("Y-m-d H:i:s"), $calData );
$delayDuration = $delayDuration / (24 * 60 * 60); //Days
$oAppDel->setDelDelayDuration( $delayDuration );
if ($fTaskDuration != 0) {
$overduePercentage = $delayDuration / $fTaskDuration;
$oAppDel->setAppOverduePercentage( $overduePercentage );
@@ -498,27 +494,41 @@ class AppDelegation extends BaseAppDelegation
$oAppDel->setAppOverduePercentage( $overduePercentage );
$oAppDel->setDelFinished( 1 );
$delDuration = $this->getDiffDate( $iFinishDate, $iInitDate );
//$delDuration = $this->getDiffDate( $iFinishDate, $iInitDate );
$delDuration = $calendar->dashCalculateDurationWithCalendar($row['DEL_INIT_DATE'], $row['DEL_FINISH_DATE'], $calData );
$delDuration = $delDuration / (24 * 60 * 60); //Saving the delDuration in days. The calculateDurationSLA func returns segs.
$oAppDel->setDelDuration( $delDuration );
//calculate due date if correspond
if ($iDueDate < $iFinishDate) {
$dueDate = strtotime($iDueDate);
$finishDate = strtotime($iFinishDate);
if ($dueDate < $finishDate) {
$oAppDel->setDelDelayed( 1 );
$delayDuration = $this->getDiffDate( $iFinishDate, $iDueDate );
//$delayDuration = $this->getDiffDate( $iFinishDate, $iDueDate );
$delayDuration = $calendar->dashCalculateDurationWithCalendar( $iDueDate, $row['DEL_FINISH_DATE'], $calData );
$delayDuration = $delayDuration / (24 * 60 * 60); //Days
} else {
$oAppDel->setDelDelayed( 0 );
$delayDuration = 0;
}
$oAppDel->setDelDelayDuration( $delayDuration );
} else {
//the task was not completed
if ($row['DEL_INIT_DATE'] != null && $row['DEL_INIT_DATE'] != '') {
$delDuration = $this->getDiffDate( $now, $iInitDate );
//$delDuration = $this->getDiffDate( $now, $iInitDate );
$delDuration = $calendar->dashCalculateDurationWithCalendar($row['DEL_INIT_DATE'], date("Y-m-d H:i:s"), $calData );
$delDuration = $delDuration / (24 * 60 * 60); //Saving the delDuration in days. The calculateDurationSLA func returns mins.
} else {
$delDuration = $this->getDiffDate( $now, $iDelegateDate );
//$delDuration = $this->getDiffDate( $now, $iDelegateDate );
$delDuration = $calendar->dashCalculateDurationWithCalendar($row['DEL_DELEGATE_DATE'], date("Y-m-d H:i:s"), $calData );
$delDuration = $delDuration / (24 * 60 * 60); //Saving the delDuration in days. The calculateDurationSLA func returns mins.
}
$oAppDel->setDelDuration( $delDuration );
//we are putting negative number if the task is not delayed, and positive number for the time the task is delayed
$delayDuration = $this->getDiffDate( $now, $iDueDate );
//$delayDuration = $this->getDiffDate( $now, $iDueDate );
$delayDuration = $calendar->dashCalculateDurationWithCalendar( $iDueDate, date("Y-m-d H:i:s"), $calData );
$delayDuration = $delayDuration / (24 * 60 * 60); //Days
$oAppDel->setDelDelayDuration( $delayDuration );
if ($fTaskDuration != 0) {
$overduePercentage = $delayDuration / $fTaskDuration;
@@ -530,7 +540,6 @@ class AppDelegation extends BaseAppDelegation
}
}
//and finally save the record
$RES = $oAppDel->save();
$rs->next();

106
workflow/engine/classes/model/Application.php
View File

@@ -572,5 +572,111 @@ class Application extends BaseApplication
return $this->getAppUid();
}
/*----------------------------------********---------------------------------*/
public function calculateAppDuration ($cron = 0)
{
try {
if ($cron == 1) {
$arrayCron = unserialize( trim( @file_get_contents( PATH_DATA . "cron" ) ) );
$arrayCron["processcTimeStart"] = time();
@file_put_contents( PATH_DATA . "cron", serialize( $arrayCron ) );
}
$calendar = new calendar();
$c = new Criteria( 'workflow' );
$c->clearSelectColumns();
$c->addSelectColumn( ApplicationPeer::APP_UID );
$c->addSelectColumn( ApplicationPeer::APP_NUMBER );
$c->addSelectColumn( ApplicationPeer::APP_STATUS );
$c->addSelectColumn( ApplicationPeer::PRO_UID );
$c->addSelectColumn( ApplicationPeer::APP_INIT_USER );
$c->addSelectColumn( ApplicationPeer::APP_CUR_USER );
$c->addSelectColumn( ApplicationPeer::APP_CREATE_DATE );
$c->addSelectColumn( ApplicationPeer::APP_INIT_DATE );
$c->addSelectColumn( ApplicationPeer::APP_FINISH_DATE );
$c->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE );
$c->addSelectColumn( ApplicationPeer::APP_DURATION );
$c->addSelectColumn( ApplicationPeer::APP_DELAY_DURATION );
$c->addSelectColumn( ProcessPeer::PRO_TIME );
$c->addSelectColumn( ProcessPeer::PRO_TIMEUNIT );
$c->addJoin( ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN );
$rs = ApplicationPeer::doSelectRS( $c );
$rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$rs->next();
$row = $rs->getRow();
$i = 0;
$now = strtotime( 'now' );
while (is_array( $row )) {
$appNumber = $row['APP_NUMBER'];
$appStatus = $row['APP_STATUS'];
$appInitUser = $row['APP_INIT_USER'];
$appCurUser = $row['APP_CUR_USER'];
$appCreateDate = $row['APP_CREATE_DATE'];
$appInitDate = $row['APP_INIT_DATE'];
$appFinishDate = $row['APP_FINISH_DATE'];
$appUpdateDate = $row['APP_UPDATE_DATE'];
$appDuration = $row['APP_DURATION'];
$proTime = $row['PRO_TIME'];
$proTimeUnit = $row['PRO_TIMEUNIT'];
$proUid = $row['PRO_UID'];
//get the object,
$oApp = ApplicationPeer::retrieveByPk( $row['APP_UID'] );
//getting the calendar
$calendar->getCalendar(null, $proUid);
$calData = $calendar->getCalendarData();
/*if(G::toUpper($proTimeUnit) != 'DAYS'){ //if it is not in days must be in mins.
$proTime = $proTime / (24 * 60 * 60); //converting to Days
}*/
$proDueDate = $calendar->dashCalculateDate($row['APP_INIT_DATE'], $proTime, $proTimeUnit, $calData); //date when the process has to finish
if($appFinishDate == null){//When the process didnt finish yet.
//Duration
$appDuration = $calendar->dashCalculateDurationWithCalendar($appInitDate, date("Y-m-d H:i:s"), $calData );
$appDuration = $appDuration / (24 * 60 * 60); //Saving the proDuration in days. The calculateDurationWithCalendar func returns segs.
$oApp->setAppDuration( $appDuration );
//Delay Duration
$delayDuration = $calendar->dashCalculateDurationWithCalendar( $proDueDate, date("Y-m-d H:i:s"), $calData );//it returns in mins
$delayDuration = $delayDuration / (24 * 60 * 60); //Days
$oApp->setAppDelayDuration( $delayDuration );
} else {
//Duration
$appDuration = $calendar->dashCalculateDurationWithCalendar($appInitDate, $appFinishDate, $calData );
$appDuration = $appDuration / (24 * 60 * 60); //Saving the proDuration in days. The calculateDurationWithCalendar func returns mins.
$oApp->setAppDuration( $appDuration );
//Delay Duration
$delayDuration = $calendar->dashCalculateDurationWithCalendar( $proDueDate, $appFinishDate, $calData );
$delayDuration = $delayDuration / (24 * 60 * 60); //Days
$oApp->setAppDelayDuration( $delayDuration );
}
//and finally save the record
$RES = $oApp->save();
$rs->next();
$row = $rs->getRow();
}
if ($cron == 1) {
$arrayCron = unserialize( trim( @file_get_contents( PATH_DATA . "cron" ) ) );
$arrayCron["processcTimeStart"] = time();
@file_put_contents( PATH_DATA . "cron", serialize( $arrayCron ) );
}
} catch (Exception $oError) {
error_log( $oError->getMessage() );
}
}
/*----------------------------------********---------------------------------*/
}

4
workflow/engine/classes/model/map/ApplicationMapBuilder.php
View File

@@ -97,6 +97,10 @@ class ApplicationMapBuilder
$tMap->addColumn('APP_PIN', 'AppPin', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('APP_DURATION', 'AppDuration', 'double', CreoleTypes::DOUBLE, false, null);
$tMap->addColumn('APP_DELAY_DURATION', 'AppDelayDuration', 'double', CreoleTypes::DOUBLE, false, null);
$tMap->addValidator('APP_STATUS', 'validValues', 'propel.validator.ValidValuesValidator', 'DRAFT|TO_DO|PAUSED|COMPLETED|CANCELLED', 'Please select a valid status.');
} // doBuild()

4
workflow/engine/classes/model/map/UsersMapBuilder.php
View File

@@ -131,6 +131,10 @@ class UsersMapBuilder
$tMap->addColumn('USR_TOTAL_UNASSIGNED', 'UsrTotalUnassigned', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('USR_COST_BY_HOUR', 'UsrCostByHour', 'double', CreoleTypes::DOUBLE, false, 11,2);
$tMap->addColumn('USR_UNIT_COST', 'UsrUnitCost', 'string', CreoleTypes::VARCHAR, false, 50);
$tMap->addValidator('USR_STATUS', 'validValues', 'propel.validator.ValidValuesValidator', 'ACTIVE|INACTIVE|VACATION|CLOSED', 'Please select a valid type.');
$tMap->addValidator('USR_STATUS', 'required', 'propel.validator.RequiredValidator', '', 'Type is required.');

107
workflow/engine/classes/model/om/BaseApplication.php
View File

@@ -123,6 +123,18 @@ abstract class BaseApplication extends BaseObject implements Persistent
*/
protected $app_pin = '';
/**
* The value for the app_duration field.
* @var double
*/
protected $app_duration = 0;
/**
* The value for the app_delay_duration field.
* @var double
*/
protected $app_delay_duration = 0;
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -397,6 +409,28 @@ abstract class BaseApplication extends BaseObject implements Persistent
return $this->app_pin;
}
/**
* Get the [app_duration] column value.
*
* @return double
*/
public function getAppDuration()
{
return $this->app_duration;
}
/**
* Get the [app_delay_duration] column value.
*
* @return double
*/
public function getAppDelayDuration()
{
return $this->app_delay_duration;
}
/**
* Set the value of [app_uid] column.
*
@@ -777,6 +811,38 @@ abstract class BaseApplication extends BaseObject implements Persistent
} // setAppPin()
/**
* Set the value of [app_duration] column.
*
* @param double $v new value
* @return void
*/
public function setAppDuration($v)
{
if ($this->app_duration !== $v || $v === 0) {
$this->app_duration = $v;
$this->modifiedColumns[] = ApplicationPeer::APP_DURATION;
}
} // setAppDuration()
/**
* Set the value of [app_delay_duration] column.
*
* @param double $v new value
* @return void
*/
public function setAppDelayDuration($v)
{
if ($this->app_delay_duration !== $v || $v === 0) {
$this->app_delay_duration = $v;
$this->modifiedColumns[] = ApplicationPeer::APP_DELAY_DURATION;
}
} // setAppDelayDuration()
/**
* Hydrates (populates) the object variables with values from the database resultset.
*
@@ -826,12 +892,16 @@ abstract class BaseApplication extends BaseObject implements Persistent
$this->app_pin = $rs->getString($startcol + 15);
$this->app_duration = $rs->getFloat($startcol + 16);
$this->app_delay_duration = $rs->getFloat($startcol + 17);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 16; // 16 = ApplicationPeer::NUM_COLUMNS - ApplicationPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 18; // 18 = ApplicationPeer::NUM_COLUMNS - ApplicationPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating Application object", $e);
@@ -1083,6 +1153,12 @@ abstract class BaseApplication extends BaseObject implements Persistent
case 15:
return $this->getAppPin();
break;
case 16:
return $this->getAppDuration();
break;
case 17:
return $this->getAppDelayDuration();
break;
default:
return null;
break;
@@ -1119,6 +1195,8 @@ abstract class BaseApplication extends BaseObject implements Persistent
$keys[13] => $this->getAppUpdateDate(),
$keys[14] => $this->getAppData(),
$keys[15] => $this->getAppPin(),
$keys[16] => $this->getAppDuration(),
$keys[17] => $this->getAppDelayDuration(),
);
return $result;
}
@@ -1198,6 +1276,12 @@ abstract class BaseApplication extends BaseObject implements Persistent
case 15:
$this->setAppPin($value);
break;
case 16:
$this->setAppDuration($value);
break;
case 17:
$this->setAppDelayDuration($value);
break;
} // switch()
}
@@ -1285,6 +1369,14 @@ abstract class BaseApplication extends BaseObject implements Persistent
$this->setAppPin($arr[$keys[15]]);
}
if (array_key_exists($keys[16], $arr)) {
$this->setAppDuration($arr[$keys[16]]);
}
if (array_key_exists($keys[17], $arr)) {
$this->setAppDelayDuration($arr[$keys[17]]);
}
}
/**
@@ -1360,6 +1452,14 @@ abstract class BaseApplication extends BaseObject implements Persistent
$criteria->add(ApplicationPeer::APP_PIN, $this->app_pin);
}
if ($this->isColumnModified(ApplicationPeer::APP_DURATION)) {
$criteria->add(ApplicationPeer::APP_DURATION, $this->app_duration);
}
if ($this->isColumnModified(ApplicationPeer::APP_DELAY_DURATION)) {
$criteria->add(ApplicationPeer::APP_DELAY_DURATION, $this->app_delay_duration);
}
return $criteria;
}
@@ -1444,6 +1544,10 @@ abstract class BaseApplication extends BaseObject implements Persistent
$copyObj->setAppPin($this->app_pin);
$copyObj->setAppDuration($this->app_duration);
$copyObj->setAppDelayDuration($this->app_delay_duration);
$copyObj->setNew(true);
@@ -1489,4 +1593,3 @@ abstract class BaseApplication extends BaseObject implements Persistent
return self::$peer;
}
}

29
workflow/engine/classes/model/om/BaseApplicationPeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseApplicationPeer
const CLASS_DEFAULT = 'classes.model.Application';
/** The total number of columns. */
const NUM_COLUMNS = 16;
const NUM_COLUMNS = 18;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -79,6 +79,12 @@ abstract class BaseApplicationPeer
/** the column name for the APP_PIN field */
const APP_PIN = 'APPLICATION.APP_PIN';
/** the column name for the APP_DURATION field */
const APP_DURATION = 'APPLICATION.APP_DURATION';
/** the column name for the APP_DELAY_DURATION field */
const APP_DELAY_DURATION = 'APPLICATION.APP_DELAY_DURATION';
/** The PHP to DB Name Mapping */
private static $phpNameMap = null;
@@ -90,10 +96,10 @@ abstract class BaseApplicationPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('AppUid', 'AppNumber', 'AppParent', 'AppStatus', 'ProUid', 'AppProcStatus', 'AppProcCode', 'AppParallel', 'AppInitUser', 'AppCurUser', 'AppCreateDate', 'AppInitDate', 'AppFinishDate', 'AppUpdateDate', 'AppData', 'AppPin', ),
BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID, ApplicationPeer::APP_NUMBER, ApplicationPeer::APP_PARENT, ApplicationPeer::APP_STATUS, ApplicationPeer::PRO_UID, ApplicationPeer::APP_PROC_STATUS, ApplicationPeer::APP_PROC_CODE, ApplicationPeer::APP_PARALLEL, ApplicationPeer::APP_INIT_USER, ApplicationPeer::APP_CUR_USER, ApplicationPeer::APP_CREATE_DATE, ApplicationPeer::APP_INIT_DATE, ApplicationPeer::APP_FINISH_DATE, ApplicationPeer::APP_UPDATE_DATE, ApplicationPeer::APP_DATA, ApplicationPeer::APP_PIN, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'APP_NUMBER', 'APP_PARENT', 'APP_STATUS', 'PRO_UID', 'APP_PROC_STATUS', 'APP_PROC_CODE', 'APP_PARALLEL', 'APP_INIT_USER', 'APP_CUR_USER', 'APP_CREATE_DATE', 'APP_INIT_DATE', 'APP_FINISH_DATE', 'APP_UPDATE_DATE', 'APP_DATA', 'APP_PIN', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
BasePeer::TYPE_PHPNAME => array ('AppUid', 'AppNumber', 'AppParent', 'AppStatus', 'ProUid', 'AppProcStatus', 'AppProcCode', 'AppParallel', 'AppInitUser', 'AppCurUser', 'AppCreateDate', 'AppInitDate', 'AppFinishDate', 'AppUpdateDate', 'AppData', 'AppPin', 'AppDuration', 'AppDelayDuration', ),
BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID, ApplicationPeer::APP_NUMBER, ApplicationPeer::APP_PARENT, ApplicationPeer::APP_STATUS, ApplicationPeer::PRO_UID, ApplicationPeer::APP_PROC_STATUS, ApplicationPeer::APP_PROC_CODE, ApplicationPeer::APP_PARALLEL, ApplicationPeer::APP_INIT_USER, ApplicationPeer::APP_CUR_USER, ApplicationPeer::APP_CREATE_DATE, ApplicationPeer::APP_INIT_DATE, ApplicationPeer::APP_FINISH_DATE, ApplicationPeer::APP_UPDATE_DATE, ApplicationPeer::APP_DATA, ApplicationPeer::APP_PIN, ApplicationPeer::APP_DURATION, ApplicationPeer::APP_DELAY_DURATION, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'APP_NUMBER', 'APP_PARENT', 'APP_STATUS', 'PRO_UID', 'APP_PROC_STATUS', 'APP_PROC_CODE', 'APP_PARALLEL', 'APP_INIT_USER', 'APP_CUR_USER', 'APP_CREATE_DATE', 'APP_INIT_DATE', 'APP_FINISH_DATE', 'APP_UPDATE_DATE', 'APP_DATA', 'APP_PIN', 'APP_DURATION', 'APP_DELAY_DURATION', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
);
/**
@@ -103,10 +109,10 @@ abstract class BaseApplicationPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'AppNumber' => 1, 'AppParent' => 2, 'AppStatus' => 3, 'ProUid' => 4, 'AppProcStatus' => 5, 'AppProcCode' => 6, 'AppParallel' => 7, 'AppInitUser' => 8, 'AppCurUser' => 9, 'AppCreateDate' => 10, 'AppInitDate' => 11, 'AppFinishDate' => 12, 'AppUpdateDate' => 13, 'AppData' => 14, 'AppPin' => 15, ),
BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID => 0, ApplicationPeer::APP_NUMBER => 1, ApplicationPeer::APP_PARENT => 2, ApplicationPeer::APP_STATUS => 3, ApplicationPeer::PRO_UID => 4, ApplicationPeer::APP_PROC_STATUS => 5, ApplicationPeer::APP_PROC_CODE => 6, ApplicationPeer::APP_PARALLEL => 7, ApplicationPeer::APP_INIT_USER => 8, ApplicationPeer::APP_CUR_USER => 9, ApplicationPeer::APP_CREATE_DATE => 10, ApplicationPeer::APP_INIT_DATE => 11, ApplicationPeer::APP_FINISH_DATE => 12, ApplicationPeer::APP_UPDATE_DATE => 13, ApplicationPeer::APP_DATA => 14, ApplicationPeer::APP_PIN => 15, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'APP_NUMBER' => 1, 'APP_PARENT' => 2, 'APP_STATUS' => 3, 'PRO_UID' => 4, 'APP_PROC_STATUS' => 5, 'APP_PROC_CODE' => 6, 'APP_PARALLEL' => 7, 'APP_INIT_USER' => 8, 'APP_CUR_USER' => 9, 'APP_CREATE_DATE' => 10, 'APP_INIT_DATE' => 11, 'APP_FINISH_DATE' => 12, 'APP_UPDATE_DATE' => 13, 'APP_DATA' => 14, 'APP_PIN' => 15, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'AppNumber' => 1, 'AppParent' => 2, 'AppStatus' => 3, 'ProUid' => 4, 'AppProcStatus' => 5, 'AppProcCode' => 6, 'AppParallel' => 7, 'AppInitUser' => 8, 'AppCurUser' => 9, 'AppCreateDate' => 10, 'AppInitDate' => 11, 'AppFinishDate' => 12, 'AppUpdateDate' => 13, 'AppData' => 14, 'AppPin' => 15, 'AppDuration' => 16, 'AppDelayDuration' => 17, ),
BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID => 0, ApplicationPeer::APP_NUMBER => 1, ApplicationPeer::APP_PARENT => 2, ApplicationPeer::APP_STATUS => 3, ApplicationPeer::PRO_UID => 4, ApplicationPeer::APP_PROC_STATUS => 5, ApplicationPeer::APP_PROC_CODE => 6, ApplicationPeer::APP_PARALLEL => 7, ApplicationPeer::APP_INIT_USER => 8, ApplicationPeer::APP_CUR_USER => 9, ApplicationPeer::APP_CREATE_DATE => 10, ApplicationPeer::APP_INIT_DATE => 11, ApplicationPeer::APP_FINISH_DATE => 12, ApplicationPeer::APP_UPDATE_DATE => 13, ApplicationPeer::APP_DATA => 14, ApplicationPeer::APP_PIN => 15, ApplicationPeer::APP_DURATION => 16, ApplicationPeer::APP_DELAY_DURATION => 17, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'APP_NUMBER' => 1, 'APP_PARENT' => 2, 'APP_STATUS' => 3, 'PRO_UID' => 4, 'APP_PROC_STATUS' => 5, 'APP_PROC_CODE' => 6, 'APP_PARALLEL' => 7, 'APP_INIT_USER' => 8, 'APP_CUR_USER' => 9, 'APP_CREATE_DATE' => 10, 'APP_INIT_DATE' => 11, 'APP_FINISH_DATE' => 12, 'APP_UPDATE_DATE' => 13, 'APP_DATA' => 14, 'APP_PIN' => 15, 'APP_DURATION' => 16, 'APP_DELAY_DURATION' => 17, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
);
/**
@@ -239,6 +245,10 @@ abstract class BaseApplicationPeer
$criteria->addSelectColumn(ApplicationPeer::APP_PIN);
$criteria->addSelectColumn(ApplicationPeer::APP_DURATION);
$criteria->addSelectColumn(ApplicationPeer::APP_DELAY_DURATION);
}
const COUNT = 'COUNT(APPLICATION.APP_UID)';
@@ -642,4 +652,3 @@ if (Propel::isInit()) {
require_once 'classes/model/map/ApplicationMapBuilder.php';
Propel::registerMapBuilder('classes.model.map.ApplicationMapBuilder');
}

109
workflow/engine/classes/model/om/BaseUsers.php
View File

@@ -183,6 +183,17 @@ abstract class BaseUsers extends BaseObject implements Persistent
*/
protected $usr_ux = 'NORMAL';
/**
* The value for the usr_cost_by_hour field.
* @var double
*/
protected $usr_cost_by_hour = 0;
/**
* The value for the usr_unit_cost field.
* @var string
*/
protected $usr_unit_cost = '';
/**
* The value for the usr_total_inbox field.
* @var int
@@ -609,6 +620,28 @@ abstract class BaseUsers extends BaseObject implements Persistent
return $this->usr_ux;
}
/**
* Get the [usr_cost_by_hour] column value.
*
* @return double
*/
public function getUsrCostByHour()
{
return $this->usr_cost_by_hour;
}
/**
* Get the [usr_unit_cost] column value.
*
* @return string
*/
public function getUsrUnitCost()
{
return $this->usr_unit_cost;
}
/**
* Get the [usr_total_inbox] column value.
*
@@ -1286,6 +1319,44 @@ abstract class BaseUsers extends BaseObject implements Persistent
} // setUsrUx()
/**
* Set the value of [usr_cost_by_hour] column.
*
* @param double $v new value
* @return void
*/
public function setUsrCostByHour($v)
{
if ($this->usr_cost_by_hour !== $v || $v === 0) {
$this->usr_cost_by_hour = $v;
$this->modifiedColumns[] = UsersPeer::USR_COST_BY_HOUR;
}
} // setUsrCostByHour()
/**
* Set the value of [usr_unit_cost] column.
*
* @param string $v new value
* @return void
*/
public function setUsrUnitCost($v)
{
// Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
$v = (string) $v;
}
if ($this->usr_unit_cost !== $v || $v === '') {
$this->usr_unit_cost = $v;
$this->modifiedColumns[] = UsersPeer::USR_UNIT_COST;
}
} // setUsrUnitCost()
/**
* Set the value of [usr_total_inbox] column.
*
@@ -1509,6 +1580,10 @@ abstract class BaseUsers extends BaseObject implements Persistent
$this->usr_ux = $rs->getString($startcol + 25);
$this->usr_cost_by_hour = $rs->getFloat($startcol + 26);
$this->usr_unit_cost = $rs->getString($startcol + 27);
$this->usr_total_inbox = $rs->getInt($startcol + 26);
$this->usr_total_draft = $rs->getInt($startcol + 27);
@@ -1528,7 +1603,7 @@ abstract class BaseUsers extends BaseObject implements Persistent
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 33; // 33 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 35; // 35 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating Users object", $e);
@@ -1831,6 +1906,12 @@ abstract class BaseUsers extends BaseObject implements Persistent
case 32:
return $this->getUsrTotalUnassigned();
break;
case 33:
return $this->getUsrCostByHour();
break;
case 34:
return $this->getUsrUnitCost();
break;
default:
return null;
break;
@@ -1884,6 +1965,8 @@ abstract class BaseUsers extends BaseObject implements Persistent
$keys[30] => $this->getUsrTotalPaused(),
$keys[31] => $this->getUsrTotalCompleted(),
$keys[32] => $this->getUsrTotalUnassigned(),
$keys[33] => $this->getUsrCostByHour(),
$keys[34] => $this->getUsrUnitCost(),
);
return $result;
}
@@ -2014,6 +2097,12 @@ abstract class BaseUsers extends BaseObject implements Persistent
case 32:
$this->setUsrTotalUnassigned($value);
break;
case 26:
$this->setUsrCostByHour($value);
break;
case 27:
$this->setUsrUnitCost($value);
break;
} // switch()
}
@@ -2169,6 +2258,14 @@ abstract class BaseUsers extends BaseObject implements Persistent
$this->setUsrTotalUnassigned($arr[$keys[32]]);
}
if (array_key_exists($keys[33], $arr)) {
$this->setUsrCostByHour($arr[$keys[26]]);
}
if (array_key_exists($keys[34], $arr)) {
$this->setUsrUnitCost($arr[$keys[27]]);
}
}
/**
@@ -2312,6 +2409,13 @@ abstract class BaseUsers extends BaseObject implements Persistent
$criteria->add(UsersPeer::USR_TOTAL_UNASSIGNED, $this->usr_total_unassigned);
}
if ($this->isColumnModified(UsersPeer::USR_COST_BY_HOUR)) {
$criteria->add(UsersPeer::USR_COST_BY_HOUR, $this->usr_cost_by_hour);
}
if ($this->isColumnModified(UsersPeer::USR_UNIT_COST)) {
$criteria->add(UsersPeer::USR_UNIT_COST, $this->usr_unit_cost);
}
return $criteria;
}
@@ -2430,6 +2534,9 @@ abstract class BaseUsers extends BaseObject implements Persistent
$copyObj->setUsrTotalUnassigned($this->usr_total_unassigned);
$copyObj->setUsrCostByHour($this->usr_cost_by_hour);
$copyObj->setUsrUnitCost($this->usr_unit_cost);
$copyObj->setNew(true);

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

@@ -1476,6 +1476,8 @@
<column name="USR_TOTAL_PAUSED" type="INTEGER" default="0"/>
<column name="USR_TOTAL_COMPLETED" type="INTEGER" default="0"/>
<column name="USR_TOTAL_UNASSIGNED" type="INTEGER" default="0"/>
<column name="USR_COST_BY_HOUR" type="DOUBLE" size="11,2" required="false" default="0"/>
<column name="USR_UNIT_COST" type="VARCHAR" size="50" required="false" default=""/>
<validator column="USR_STATUS">
<rule name="validValues" value="ACTIVE|INACTIVE|VACATION|CLOSED" message="Please select a valid type."/>
<rule name="required" message="Type is required."/>
@@ -4816,5 +4818,217 @@
</vendor>
</column>
</table>
<table name="USR_REPORTING">
<vendor type="mysql">
<parameter name="Name" value="USR_REPORTING" />
<parameter name="Engine" value="InnoDB" />
<parameter name="Version" value="10" />
<parameter name="Row_format" value="Dynamic" />
<parameter name="Data_free" value="0" />
<parameter name="Auto_increment" value="" />
<parameter name="Check_time" value="" />
<parameter name="Collation" value="utf8_general_ci" />
<parameter name="Checksum" value="" />
<parameter name="Create_options" value="" />
<parameter name="Comment" value="Data calculated users by task"/>
</vendor>
<column name="USR_UID" type="VARCHAR" size="32" required="true" primaryKey="true" />
<column name="TAS_UID" type="VARCHAR" size="32" required="true" primaryKey="true" />
<column name="PRO_UID" type="VARCHAR" size="32" required="true" />
<column name="MONTH" type="INTEGER" required="true" default="0" primaryKey="true" />
<column name="YEAR" type="INTEGER" required="true" default="0" primaryKey="true" />
<column name="TOTAL_TIME_BY_TASK" type="DECIMAL" size="7,2"/>
<column name="TOTAL_CASES_IN" type="DECIMAL" size="7,2"/>
<column name="TOTAL_CASES_OUT" type="DECIMAL" size="7,2"/>
<column name="USER_HOUR_COST" type="DECIMAL" size="7,2"/>
<column name="AVG_TIME" type="DECIMAL" size="7,2"/>
<column name="SDV_TIME" type="DECIMAL" size="7,2"/>
<column name="CONFIGURED_TASK_TIME" type="DECIMAL" size="7,2"/>
<column name="TOTAL_CASES_OVERDUE" type="DECIMAL" size="7,2"/>
<column name="TOTAL_CASES_ON_TIME" type="DECIMAL" size="7,2"/>
<index name="indexReporting">
<index-column name="USR_UID"/>
<index-column name="TAS_UID"/>
<index-column name="PRO_UID"/>
<vendor type="mysql">
<parameter name="Table" value="USR_REPORTING"/>
<parameter name="Non_unique" value="1"/>
<parameter name="Key_name" value="indexReporting"/>
<parameter name="Seq_in_index" value="1"/>
<parameter name="Column_name" value="USR_UID"/>
<parameter name="Collation" value="A"/>
<parameter name="Cardinality" value=""/>
<parameter name="Sub_part" value=""/>
<parameter name="Packed" value=""/>
<parameter name="Null" value=""/>
<parameter name="Index_type" value="BTREE"/>
<parameter name="Comment" value=""/>
</vendor>
</index>
</table>
<table name="PRO_REPORTING">
<vendor type="mysql">
<parameter name="Name" value="PRO_REPORTING" />
<parameter name="Engine" value="InnoDB" />
<parameter name="Version" value="10" />
<parameter name="Row_format" value="Dynamic" />
<parameter name="Data_free" value="0" />
<parameter name="Auto_increment" value="" />
<parameter name="Check_time" value="" />
<parameter name="Collation" value="utf8_general_ci" />
<parameter name="Checksum" value="" />
<parameter name="Create_options" value="" />
<parameter name="Comment" value="Data calculated by process"/>
</vendor>
<column name="PRO_UID" type="VARCHAR" size="32" required="true" primaryKey="true" />
<column name="MONTH" type="INTEGER" required="true" default="0" primaryKey="true" />
<column name="YEAR" type="INTEGER" required="true" default="0" primaryKey="true" />
<column name="AVG_TIME" type="DECIMAL" size="7,2"/>
<column name="SDV_TIME" type="DECIMAL" size="7,2"/>
<column name="TOTAL_CASES_IN" type="DECIMAL" size="7,2"/>
<column name="TOTAL_CASES_OUT" type="DECIMAL" size="7,2"/>
<column name="CONFIGURED_PROCESS_TIME" type="DECIMAL" size="7,2"/>
<column name="CONFIGURED_PROCESS_COST" type="DECIMAL" size="7,2"/>
<column name="TOTAL_CASES_OPEN" type="DECIMAL" size="7,2"/>
<column name="TOTAL_CASES_OVERDUE" type="DECIMAL" size="7,2"/>
<column name="TOTAL_CASES_ON_TIME" type="DECIMAL" size="7,2"/>
</table>
<table name="DASHBOARD">
<vendor type="mysql">
<parameter name="Name" value="DASHBOARD" />
<parameter name="Engine" value="InnoDB" />
<parameter name="Version" value="10" />
<parameter name="Row_format" value="Dynamic" />
<parameter name="Data_free" value="0" />
<parameter name="Auto_increment" value="" />
<parameter name="Check_time" value="" />
<parameter name="Collation" value="utf8_general_ci" />
<parameter name="Checksum" value="" />
<parameter name="Create_options" value="" />
<parameter name="Comment" value="Dashboard definitions."/>
</vendor>
<column name="DAS_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="" />
<column name="DAS_TITLE" type="VARCHAR" size="255" required="true" default="" />
<column name="DAS_DESCRIPTION" type="LONGVARCHAR" required="false" />
<column name="DAS_CREATE_DATE" type="TIMESTAMP" required="true" />
<column name="DAS_UPDATE_DATE" type="TIMESTAMP" required="false" />
<column name="DAS_STATUS" type="TINYINT" required="true" default="1"/>
</table>
<table name="DASHBOARD_INDICATOR">
<vendor type="mysql">
<parameter name="Name" value="DASHBOARD_INDICATOR" />
<parameter name="Engine" value="InnoDB" />
<parameter name="Version" value="10" />
<parameter name="Row_format" value="Dynamic" />
<parameter name="Data_free" value="0" />
<parameter name="Auto_increment" value="" />
<parameter name="Check_time" value="" />
<parameter name="Collation" value="utf8_general_ci" />
<parameter name="Checksum" value="" />
<parameter name="Create_options" value="" />
<parameter name="Comment" value="Dashboard Indicators definitions."/>
</vendor>
<column name="DAS_IND_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="" />
<column name="DAS_UID" type="VARCHAR" size="32" required="true" default="" />
<column name="DAS_IND_TYPE" type="VARCHAR" size="32" required="true" default="" />
<column name="DAS_IND_TITLE" type="VARCHAR" size="255" required="true" default="" />
<column name="DAS_IND_GOAL" type="DECIMAL" size="7,2" required="true" />
<column name="DAS_IND_DIRECTION" type="TINYINT" required="true" default="2"/>
<column name="DAS_UID_PROCESS" type="VARCHAR" size="32" required="true" default="" />
<column name="DAS_IND_FIRST_FIGURE" type="VARCHAR" size="32" required="false" default="" />
<column name="DAS_IND_FIRST_FREQUENCY" type="VARCHAR" size="32" required="false" default="" />
<column name="DAS_IND_SECOND_FIGURE" type="VARCHAR" size="32" required="false" default="" />
<column name="DAS_IND_SECOND_FREQUENCY" type="VARCHAR" size="32" required="false" default="" />
<column name="DAS_IND_CREATE_DATE" type="TIMESTAMP" required="true" />
<column name="DAS_IND_UPDATE_DATE" type="TIMESTAMP" required="false" />
<column name="DAS_IND_STATUS" type="TINYINT" required="true" default="1"/>
<foreign-key name="fk_dashboard_indicator_dashboard" foreignTable="DASHBOARD">
<reference local="DAS_UID" foreign="DAS_UID"/>
</foreign-key>
<index name="indexDashboard">
<index-column name="DAS_UID"/>
<index-column name="DAS_IND_TYPE"/>
<vendor type="mysql">
<parameter name="Table" value="DASHBOARD_INDICATOR"/>
<parameter name="Non_unique" value="1"/>
<parameter name="Key_name" value="indexDashboard"/>
<parameter name="Seq_in_index" value="1"/>
<parameter name="Column_name" value="DAS_UID"/>
<parameter name="Collation" value="A"/>
<parameter name="Cardinality" value=""/>
<parameter name="Sub_part" value=""/>
<parameter name="Packed" value=""/>
<parameter name="Null" value=""/>
<parameter name="Index_type" value="BTREE"/>
<parameter name="Comment" value=""/>
</vendor>
</index>
</table>
<table name="DASHBOARD_DAS_IND">
<vendor type="mysql">
<parameter name="Name" value="DASHBOARD_DAS_IND" />
<parameter name="Engine" value="InnoDB" />
<parameter name="Version" value="10" />
<parameter name="Row_format" value="Dynamic" />
<parameter name="Data_free" value="0" />
<parameter name="Auto_increment" value="" />
<parameter name="Check_time" value="" />
<parameter name="Collation" value="utf8_general_ci" />
<parameter name="Checksum" value="" />
<parameter name="Create_options" value="" />
<parameter name="Comment" value="Dashboard definitions to user."/>
</vendor>
<column name="DAS_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="OWNER_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="OWNER_TYPE" type="VARCHAR" size="15" required="true" default=""/>
<foreign-key name="fk_dashboard_indicator_dashboard_das_ind" foreignTable="DASHBOARD">
<reference local="DAS_UID" foreign="DAS_UID"/>
</foreign-key>
</table>
<table name="CATALOG">
<vendor type="mysql">
<parameter name="Name" value="CATALOG" />
<parameter name="Engine" value="InnoDB" />
<parameter name="Version" value="10" />
<parameter name="Row_format" value="Dynamic" />
<parameter name="Data_free" value="0" />
<parameter name="Auto_increment" value="" />
<parameter name="Check_time" value="" />
<parameter name="Collation" value="utf8_general_ci" />
<parameter name="Checksum" value="" />
<parameter name="Create_options" value="" />
<parameter name="Comment" value="Definitions catalog."/>
</vendor>
<column name="CAT_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="0"/>
<column name="CAT_LABEL_ID" type="VARCHAR" size="100" required="true" default=""/>
<column name="CAT_TYPE" type="VARCHAR" size="100" required="true" primaryKey="true" default=""/>
<column name="CAT_FLAG" type="VARCHAR" size="50" required="false" default=""/>
<column name="CAT_OBSERVATION" type="LONGVARCHAR" required="false" default=""/>
<column name="CAT_CREATE_DATE" type="TIMESTAMP" required="true" />
<column name="CAT_UPDATE_DATE" type="TIMESTAMP" required="false" />
<index name="indexType">
<index-column name="CAT_TYPE"/>
<vendor type="mysql">
<parameter name="Table" value="CATALOG"/>
<parameter name="Non_unique" value="1"/>
<parameter name="Key_name" value="indexDashboard"/>
<parameter name="Seq_in_index" value="1"/>
<parameter name="Column_name" value="CAT_TYPE"/>
<parameter name="Collation" value="A"/>
<parameter name="Cardinality" value=""/>
<parameter name="Sub_part" value=""/>
<parameter name="Packed" value=""/>
<parameter name="Null" value=""/>
<parameter name="Index_type" value="BTREE"/>
<parameter name="Comment" value=""/>
</vendor>
</index>
</table>
</database>

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

@@ -413,7 +413,7 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('AR', 'B', 'Buenos Aires' ) ,
('AR', 'C', 'Distrito Federal' ) ,
('AR', 'D', 'San Luis' ) ,
('AR', 'E', 'Entre Ríos' ) ,
('AR', 'E', 'Entre Ríos' ) ,
('AR', 'F', 'La Rioja' ) ,
('AR', 'G', 'Santiago del Estero' ) ,
('AR', 'H', 'Chaco' ) ,
@@ -423,14 +423,14 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('AR', 'M', 'Mendoza' ) ,
('AR', 'N', 'Misiones' ) ,
('AR', 'P', 'Formosa' ) ,
('AR', 'Q', 'Neuquén' ) ,
('AR', 'R', 'Río Negro' ) ,
('AR', 'Q', 'Neuquén' ) ,
('AR', 'R', 'Río Negro' ) ,
('AR', 'S', 'Santa Fe' ) ,
('AR', 'T', 'Tucumán' ) ,
('AR', 'T', 'Tucumán' ) ,
('AR', 'U', 'Chubut' ) ,
('AR', 'V', 'Tierra del Fuego' ) ,
('AR', 'W', 'Corrientes' ) ,
('AR', 'X', 'Córdoba' ) ,
('AR', 'X', 'Córdoba' ) ,
('AR', 'Y', 'Jujuy' ) ,
('AR', 'Z', 'Santa Cruz' ) ,
('AU', 'CT', 'Australian Capital Territory' ) ,
@@ -441,17 +441,17 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('AU', 'TS', 'Tasmania' ) ,
('AU', 'VI', 'Victoria' ) ,
('AU', 'WA', 'Western Australia' ) ,
('BE', 'BRU', 'Bruxelles-Capitale, Région de (fr), Brussels Hoofdstedelijk Gewest (nl)' ) ,
('BE', 'BRU', 'Bruxelles-Capitale, Région de (fr), Brussels Hoofdstedelijk Gewest (nl)' ) ,
('BE', 'VAN', 'Antwerpen (VLG)' ) ,
('BE', 'VBR', 'Vlaams Brabant (VLG)' ) ,
('BE', 'VLG', 'Vlaamse Gewest (nl)' ) ,
('BE', 'VLI', 'Limburg (VLG)' ) ,
('BE', 'VOV', 'Oost-Vlaanderen (VLG)' ) ,
('BE', 'VWV', 'West-Vlaanderen (VLG)' ) ,
('BE', 'WAL', 'Wallonne, Région (fr)' ) ,
('BE', 'WAL', 'Wallonne, Région (fr)' ) ,
('BE', 'WBR', 'Brabant Wallon (WAL)' ) ,
('BE', 'WHT', 'Hainaut (WAL)' ) ,
('BE', 'WLG', 'Liège (WAL)' ) ,
('BE', 'WLG', 'Liège (WAL)' ) ,
('BE', 'WLX', 'Luxembourg (WAL)' ) ,
('BE', 'WNA', 'Namur (WAL)' ) ,
('BO', 'B', 'El Beni' ) ,
@@ -460,35 +460,35 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('BO', 'L', 'La Paz' ) ,
('BO', 'N', 'Pando' ) ,
('BO', 'O', 'Oruro' ) ,
('BO', 'P', 'Potosí' ) ,
('BO', 'P', 'Potosí' ) ,
('BO', 'S', 'Santa Cruz' ) ,
('BO', 'T', 'Tarija' ) ,
('BR', 'AC', 'Acre' ) ,
('BR', 'AL', 'Alagoas' ) ,
('BR', 'AM', 'Amazonas' ) ,
('BR', 'AP', 'Amapá' ) ,
('BR', 'AP', 'Amapá' ) ,
('BR', 'BA', 'Bahia' ) ,
('BR', 'CE', 'Ceará' ) ,
('BR', 'CE', 'Ceará' ) ,
('BR', 'DF', 'Distrito Federal' ) ,
('BR', 'ES', 'Espírito Santo' ) ,
('BR', 'GO', 'Goiás' ) ,
('BR', 'MA', 'Maranhão' ) ,
('BR', 'ES', 'Espírito Santo' ) ,
('BR', 'GO', 'Goiás' ) ,
('BR', 'MA', 'Maranhão' ) ,
('BR', 'MG', 'Minas Gerais' ) ,
('BR', 'MS', 'Mato Grosso do Sul' ) ,
('BR', 'MT', 'Mato Grosso' ) ,
('BR', 'PA', 'Pará' ) ,
('BR', 'PB', 'Paraíba' ) ,
('BR', 'PA', 'Pará' ) ,
('BR', 'PB', 'Paraíba' ) ,
('BR', 'PE', 'Pernambuco' ) ,
('BR', 'PI', 'Piauí' ) ,
('BR', 'PR', 'Paraná' ) ,
('BR', 'PI', 'Piauí' ) ,
('BR', 'PR', 'Paraná' ) ,
('BR', 'RJ', 'Rio de Janeiro' ) ,
('BR', 'RN', 'Rio Grande do Norte' ) ,
('BR', 'RO', 'Rondônia' ) ,
('BR', 'RO', 'Rondônia' ) ,
('BR', 'RR', 'Roraima' ) ,
('BR', 'RS', 'Rio Grande do Sul' ) ,
('BR', 'SC', 'Santa Catarina' ) ,
('BR', 'SE', 'Sergipe' ) ,
('BR', 'SP', 'São Paulo' ) ;
('BR', 'SP', 'São Paulo' ) ;
INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('BR', 'TO', 'Tocantins' ) ,
('CA', 'AB', 'Alberta' ) ,
@@ -511,12 +511,12 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('CH', 'BL', 'Basel-Landschaft (de)' ) ,
('CH', 'BS', 'Basel-Stadt (de)' ) ,
('CH', 'FR', 'Fribourg (fr)' ) ,
('CH', 'GE', 'Genève (fr)' ) ,
('CH', 'GE', 'Genève (fr)' ) ,
('CH', 'GL', 'Glarus (de)' ) ,
('CH', 'GR', 'Graubünden (de)' ) ,
('CH', 'GR', 'Graubünden (de)' ) ,
('CH', 'JU', 'Jura (fr)' ) ,
('CH', 'LU', 'Luzern (de)' ) ,
('CH', 'NE', 'Neuchâtel (fr)' ) ,
('CH', 'NE', 'Neuchâtel (fr)' ) ,
('CH', 'NW', 'Nidwalden (de)' ) ,
('CH', 'OW', 'Obwalden (de)' ) ,
('CH', 'SG', 'Sankt Gallen (de)' ) ,
@@ -529,20 +529,20 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('CH', 'VD', 'Vaud (fr)' ) ,
('CH', 'VS', 'Valais (fr)' ) ,
('CH', 'ZG', 'Zug (de)' ) ,
('CH', 'ZH', 'Zürich (de)' ) ,
('CL', 'AI', 'Aisén del General Carlos Ibáñez del Campo' ) ,
('CH', 'ZH', 'Zürich (de)' ) ,
('CL', 'AI', 'Aisén del General Carlos Ibáñez del Campo' ) ,
('CL', 'AN', 'Antofagasta' ) ,
('CL', 'AR', 'La Araucanía' ) ,
('CL', 'AR', 'La Araucanía' ) ,
('CL', 'AT', 'Atacama' ) ,
('CL', 'BI', 'Biobío' ) ,
('CL', 'BI', 'Biobío' ) ,
('CL', 'CO', 'Coquimbo' ) ,
('CL', 'LI', 'Libertador General Bernardo O''Higgins' ) ,
('CL', 'LL', 'Los Lagos' ) ,
('CL', 'MA', 'Magallanes' ) ,
('CL', 'ML', 'Maule' ) ,
('CL', 'RM', 'Regón Metropolitana de Santiago' ) ,
('CL', 'TA', 'Tarapacá' ) ,
('CL', 'VS', 'Valparaíso' ) ,
('CL', 'RM', 'Regón Metropolitana de Santiago' ) ,
('CL', 'TA', 'Tarapacá' ) ,
('CL', 'VS', 'Valparaíso' ) ,
('CN', '11', 'Beijing' ) ,
('CN', '12', 'Tianjin' ) ,
('CN', '13', 'Hebei' ) ,
@@ -582,16 +582,16 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('CR', 'C', 'Cartago' ) ,
('CR', 'G', 'Guanacaste' ) ,
('CR', 'H', 'Heredia' ) ,
('CR', 'L', 'Limón' ) ,
('CR', 'L', 'Limón' ) ,
('CR', 'P', 'Puntarenas' ) ,
('CR', 'SJ', 'San José' ) ,
('CR', 'SJ', 'San José' ) ,
('CS', 'CG', 'Crna Gora' ) ,
('CS', 'KM', 'Kosovo-Metohija' ) ,
('CS', 'SR', 'Srbija' ) ,
('CS', 'VO', 'Vojvodina' ) ,
('DE', 'BE', 'Berlin' ) ,
('DE', 'BR', 'Brandenburg' ) ,
('DE', 'BW', 'Baden-Württemberg' ) ,
('DE', 'BW', 'Baden-Württemberg' ) ,
('DE', 'BY', 'Bayern' ) ,
('DE', 'HB', 'Bremen (Hansestadt)' ) ,
('DE', 'HE', 'Hessen' ) ,
@@ -604,68 +604,68 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('DE', 'SL', 'Saarland' ) ,
('DE', 'SN', 'Sachsen' ) ,
('DE', 'ST', 'Sachsen-Anhalt' ) ,
('DE', 'TH', 'Thüringen' ) ,
('DE', 'TH', 'Thüringen' ) ,
('EE', '37', 'Harjumaa' ) ,
('EE', '39', 'Hiiumaa' ) ,
('EE', '44', 'Ida-Virumaa' ) ,
('EE', '49', 'Jõgevamaa' ) ,
('EE', '51', 'Järvamaa' ) ,
('EE', '57', 'Läänemaa' ) ,
('EE', '59', 'Lääne-Virumaa' ) ,
('EE', '65', 'Põlvamaa' ) ,
('EE', '67', 'Pärnumaa' ) ,
('EE', '49', 'Jõgevamaa' ) ,
('EE', '51', 'Järvamaa' ) ,
('EE', '57', 'Läänemaa' ) ,
('EE', '59', 'Lääne-Virumaa' ) ,
('EE', '65', 'Põlvamaa' ) ,
('EE', '67', 'Pärnumaa' ) ,
('EE', '70', 'Raplamaa' ) ,
('EE', '74', 'Saaremaa' ) ,
('EE', '78', 'Tartumaa' ) ,
('EE', '82', 'Valgamaa' ) ,
('EE', '84', 'Viljandimaa' ) ,
('EE', '86', 'Võrumaa' ) ,
('EE', '86', 'Võrumaa' ) ,
('FI', 'AL', 'Ahvenanmaan Maakunta (fi)' ) ,
('FI', 'ES', 'Etelä-Suomen lääni (fi)' ) ,
('FI', 'IS', 'Itä-Suomen lääni (fi)' ) ,
('FI', 'LL', 'Lapin lääni (fi)' ) ,
('FI', 'LS', 'Länsi-Suomen lääni (fi)' ) ,
('FI', 'OL', 'Oulun lääni (fi)' ) ,
('FI', 'ES', 'Etelä-Suomen lääni (fi)' ) ,
('FI', 'IS', 'Itä-Suomen lääni (fi)' ) ,
('FI', 'LL', 'Lapin lääni (fi)' ) ,
('FI', 'LS', 'Länsi-Suomen lääni (fi)' ) ,
('FI', 'OL', 'Oulun lääni (fi)' ) ,
('FR', '01', 'Ain' ) ,
('FR', '02', 'Aisne' ) ,
('FR', '03', 'Allier' ) ,
('FR', '04', 'Alpes-de-Haute-Provence' ) ,
('FR', '05', 'Hautes-Alpes' ) ,
('FR', '06', 'Alpes-Maritimes' ) ,
('FR', '07', 'Ardèche' ) ,
('FR', '07', 'Ardèche' ) ,
('FR', '08', 'Ardennes' ) ,
('FR', '09', 'Ariège' ) ,
('FR', '09', 'Ariège' ) ,
('FR', '10', 'Aube' ) ,
('FR', '11', 'Aude' ) ,
('FR', '12', 'Aveyron' ) ,
('FR', '13', 'Bouches-du-Rhône' ) ,
('FR', '13', 'Bouches-du-Rhône' ) ,
('FR', '14', 'Calvados' ) ,
('FR', '15', 'Cantal' ) ,
('FR', '16', 'Charente' ) ,
('FR', '17', 'Charente-Maritime' ) ,
('FR', '18', 'Cher' ) ,
('FR', '19', 'Corrèze' ) ,
('FR', '21', 'Côte-d''Or' ) ,
('FR', '22', 'Côtes-d''Armor' ) ,
('FR', '19', 'Corrèze' ) ,
('FR', '21', 'Côte-d''Or' ) ,
('FR', '22', 'Côtes-d''Armor' ) ,
('FR', '23', 'Creuse' ) ,
('FR', '24', 'Dordogne' ) ,
('FR', '25', 'Doubs' ) ,
('FR', '26', 'Drôme' ) ;
('FR', '26', 'Drôme' ) ;
INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('FR', '27', 'Eure' ) ,
('FR', '28', 'Eure-et-Loir' ) ,
('FR', '29', 'Finistère' ) ,
('FR', '29', 'Finistère' ) ,
('FR', '2A', 'Corse-du-Sud' ) ,
('FR', '2B', 'Haute-Corse' ) ,
('FR', '30', 'Gard' ) ,
('FR', '31', 'Haute-Garonne' ) ,
('FR', '32', 'Gers' ) ,
('FR', '33', 'Gironde' ) ,
('FR', '34', 'Hérault' ) ,
('FR', '34', 'Hérault' ) ,
('FR', '35', 'Ille-et-Vilaine' ) ,
('FR', '36', 'Indre' ) ,
('FR', '37', 'Indre-et-Loire' ) ,
('FR', '38', 'Isère' ) ,
('FR', '38', 'Isère' ) ,
('FR', '39', 'Jura' ) ,
('FR', '40', 'Landes' ) ,
('FR', '41', 'Loir-et-Cher' ) ,
@@ -675,7 +675,7 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('FR', '45', 'Loiret' ) ,
('FR', '46', 'Lot' ) ,
('FR', '47', 'Lot-et-Garonne' ) ,
('FR', '48', 'Lozère' ) ,
('FR', '48', 'Lozère' ) ,
('FR', '49', 'Maine-et-Loire' ) ,
('FR', '50', 'Manche' ) ,
('FR', '51', 'Marne' ) ,
@@ -685,20 +685,20 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('FR', '55', 'Meuse' ) ,
('FR', '56', 'Morbihan' ) ,
('FR', '57', 'Moselle' ) ,
('FR', '58', 'Nièvre' ) ,
('FR', '58', 'Nièvre' ) ,
('FR', '59', 'Nord' ) ,
('FR', '60', 'Oise' ) ,
('FR', '61', 'Orne' ) ,
('FR', '62', 'Pas-de-Calais' ) ,
('FR', '63', 'Puy-de-Dôme' ) ,
('FR', '64', 'Pyrénées-Atlantiques' ) ,
('FR', '65', 'Hautes-Pyrénées' ) ,
('FR', '66', 'Pyrénées-Orientales' ) ,
('FR', '63', 'Puy-de-Dôme' ) ,
('FR', '64', 'Pyrénées-Atlantiques' ) ,
('FR', '65', 'Hautes-Pyrénées' ) ,
('FR', '66', 'Pyrénées-Orientales' ) ,
('FR', '67', 'Bas-Rhin' ) ,
('FR', '68', 'Haut-Rhin' ) ,
('FR', '69', 'Rhône' ) ,
('FR', '70', 'Haute-Saône' ) ,
('FR', '71', 'Saône-et-Loire' ) ,
('FR', '69', 'Rhône' ) ,
('FR', '70', 'Haute-Saône' ) ,
('FR', '71', 'Saône-et-Loire' ) ,
('FR', '72', 'Sarthe' ) ,
('FR', '73', 'Savoie' ) ,
('FR', '74', 'Haute-Savoie' ) ,
@@ -706,13 +706,13 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('FR', '76', 'Seine-Maritime' ) ,
('FR', '77', 'Seine-et-Marne' ) ,
('FR', '78', 'Yvelines' ) ,
('FR', '79', 'Deux-Sèvres' ) ,
('FR', '79', 'Deux-Sèvres' ) ,
('FR', '80', 'Somme' ) ,
('FR', '81', 'Tarn' ) ,
('FR', '82', 'Tarn-et-Garonne' ) ,
('FR', '83', 'Var' ) ,
('FR', '84', 'Vaucluse' ) ,
('FR', '85', 'Vendée' ) ,
('FR', '85', 'Vendée' ) ,
('FR', '86', 'Vienne' ) ,
('FR', '87', 'Haute-Vienne' ) ,
('FR', '88', 'Vosges' ) ,
@@ -726,7 +726,7 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('GB', 'ABD', 'Aberdeenshire' ) ,
('GB', 'ABE', 'Aberdeen City' ) ,
('GB', 'AGB', 'Argyll and Bute' ) ,
('GB', 'AGY', 'Isle of Anglesey [ Sir Ynys Môn GB-YNM]' ) ,
('GB', 'AGY', 'Isle of Anglesey [ Sir Ynys Môn GB-YNM]' ) ,
('GB', 'ANS', 'Angus' ) ,
('GB', 'ANT', 'Antrim' ) ,
('GB', 'ARD', 'Ards' ) ,
@@ -990,12 +990,12 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('GM', 'N', 'North Bank' ) ,
('GM', 'U', 'Upper River' ) ,
('GM', 'W', 'Western' ) ,
('GW', 'BA', 'Bafatá' ) ,
('GW', 'BA', 'Bafatá' ) ,
('GW', 'BL', 'Bolama' ) ,
('GW', 'BM', 'Biombo' ) ,
('GW', 'BS', 'Bissau' ) ,
('GW', 'CA', 'Cacheu' ) ,
('GW', 'GA', 'Gabù' ) ,
('GW', 'GA', 'Gabù' ) ,
('GW', 'OI', 'Oio' ) ,
('GW', 'QU', 'Quinara' ) ,
('GW', 'TO', 'Tombali' ) ,
@@ -1006,7 +1006,7 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('IN', 'BR', 'Bihar' ) ,
('IN', 'CH', 'Chandigarh' ) ,
('IN', 'CT', 'Chhattisgarh' ) ,
('IN', 'DD', 'Damán y Diu' ) ,
('IN', 'DD', 'Damán y Diu' ) ,
('IN', 'DL', 'Delhi' ) ,
('IN', 'DN', 'Dadra y Nagar Haveli' ) ,
('IN', 'GA', 'Goa' ) ,
@@ -1084,7 +1084,7 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('JP', '47', 'Okinawa' ) ,
('KM', 'A', 'Anjouan' ) ,
('KM', 'G', 'Grande Comore' ) ,
('KM', 'M', 'Mohéli' ) ,
('KM', 'M', 'Mohéli' ) ,
('KR', '11', 'Seoul Teugbyeolsi [Seoul-T'' kpy lshi]' ) ,
('KR', '26', 'Busan Gwang''yeogsi [Pusan-Kwangy kshi]' ) ,
('KR', '27', 'Daegu Gwang''yeogsi [Taegu-Kwangy kshi]' ) ,
@@ -1102,26 +1102,26 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('KR', '48', 'Gyeongsangnamdo [Ky ngsangnam-do]' ) ,
('KR', '49', 'Jejudo [Cheju-do]' ) ,
('LV', 'AI', 'Aizkraukle' ) ,
('LV', 'AL', 'Alūksne' ) ,
('LV', 'AL', 'Alūksne' ) ,
('LV', 'BL', 'Balvi' ) ,
('LV', 'BU', 'Bauska' ) ,
('LV', 'CE', 'Cēsis' ) ,
('LV', 'CE', 'CÄ“sis' ) ,
('LV', 'DA', 'Daugavpils' ) ,
('LV', 'DO', 'Dobele' ) ,
('LV', 'GU', 'Gulbene' ) ,
('LV', 'JK', 'Jēkabpils' ) ,
('LV', 'JK', 'JÄ“kabpils' ) ,
('LV', 'JL', 'Jelgava' ) ,
('LV', 'JUR', 'Jūrmala' ) ,
('LV', 'KR', 'Krāslava' ) ,
('LV', 'KU', 'Kuldīga' ) ,
('LV', 'LE', 'Liepāja' ) ,
('LV', 'LM', 'Limbaži' ) ,
('LV', 'JUR', 'JÅ«rmala' ) ,
('LV', 'KR', 'KrÄ<EFBFBD>slava' ) ,
('LV', 'KU', 'Kuldīga' ) ,
('LV', 'LE', 'LiepÄ<EFBFBD>ja' ) ,
('LV', 'LM', 'Limbaži' ) ,
('LV', 'LPX', 'Liepdja' ) ,
('LV', 'LU', 'Ludza' ) ,
('LV', 'MA', 'Madona' ) ,
('LV', 'OG', 'Ogre' ) ,
('LV', 'PR', 'Preiļi' ) ,
('LV', 'RE', 'Rēzekne' ) ,
('LV', 'PR', 'Preiļi' ) ,
('LV', 'RE', 'RÄ“zekne' ) ,
('LV', 'RI', 'Riga' ) ,
('LV', 'SA', 'Saldus' ) ,
('LV', 'TA', 'Talsi' ) ,
@@ -1144,25 +1144,25 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('MX', 'GUA', 'Guanajuato' ) ,
('MX', 'HID', 'Hidalgo' ) ,
('MX', 'JAL', 'Jalisco' ) ,
('MX', 'MEX', 'México' ) ,
('MX', 'MIC', 'Michoacán' ) ,
('MX', 'MEX', 'México' ) ,
('MX', 'MIC', 'Michoacán' ) ,
('MX', 'MOR', 'Morelos' ) ,
('MX', 'NAY', 'Nayarit' ) ,
('MX', 'NLE', 'Nuevo León' ) ,
('MX', 'NLE', 'Nuevo León' ) ,
('MX', 'OAX', 'Oaxaca' ) ,
('MX', 'PUE', 'Puebla' ) ,
('MX', 'QUE', 'Querétaro' ) ,
('MX', 'QUE', 'Querétaro' ) ,
('MX', 'ROO', 'Quintana Roo' ) ,
('MX', 'SIN', 'Sinaloa' ) ,
('MX', 'SLP', 'San Luis Potosí' ) ,
('MX', 'SLP', 'San Luis Potosí' ) ,
('MX', 'SON', 'Sonora' ) ,
('MX', 'TAB', 'Tabasco' ) ,
('MX', 'TAM', 'Tamaulipas' ) ,
('MX', 'TLA', 'Tlaxcala' ) ,
('MX', 'VER', 'Veracruz' ) ,
('MX', 'YUC', 'Yucatán' ) ,
('MX', 'YUC', 'Yucatán' ) ,
('MX', 'ZAC', 'Zacatecas' ) ,
('NO', '01', 'Østfold' ) ,
('NO', '01', 'Østfold' ) ,
('NO', '02', 'Akershus' ) ,
('NO', '03', 'Oslo' ) ,
('NO', '04', 'Hedmark' ) ,
@@ -1175,9 +1175,9 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('NO', '11', 'Rogaland' ) ,
('NO', '12', 'Hordaland' ) ,
('NO', '14', 'Sogn og Fjordane' ) ,
('NO', '15', 'Møre og Romsdal' ) ,
('NO', '16', 'Sør-Trøndelag' ) ,
('NO', '17', 'Nord-Trøndelag' ) ,
('NO', '15', 'Møre og Romsdal' ) ,
('NO', '16', 'Sør-Trøndelag' ) ,
('NO', '17', 'Nord-Trøndelag' ) ,
('NO', '18', 'Nordland' ) ,
('NO', '19', 'Troms' ) ,
('NO', '20', 'Finnmark' ) ,
@@ -1203,42 +1203,42 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('PT', '04', 'Braganza' ) ,
('PT', '05', 'Castelo Branco' ) ,
('PT', '06', 'Coimbra' ) ,
('PT', '07', 'Évora' ) ,
('PT', '07', 'Évora' ) ,
('PT', '08', 'Faro' ) ,
('PT', '09', 'Guarda' ) ,
('PT', '10', 'Leiria' ) ,
('PT', '11', 'Lisboa' ) ,
('PT', '12', 'Portalegre' ) ,
('PT', '13', 'Porto' ) ,
('PT', '14', 'Santarém' ) ,
('PT', '15', 'Setúbal' ) ,
('PT', '14', 'Santarém' ) ,
('PT', '15', 'Setúbal' ) ,
('PT', '16', 'Viana do Castelo' ) ,
('PT', '17', 'Vila Real' ) ,
('PT', '18', 'Viseu' ) ,
('PT', '20', 'Região Autónoma dos Açores' ) ,
('PT', '30', 'Região Autónoma da Madeira' ) ,
('PT', '20', 'Região Autónoma dos Açores' ) ,
('PT', '30', 'Região Autónoma da Madeira' ) ,
('SE', 'AB', 'Stockholms' ) ;
INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('SE', 'AC', 'Vesterbottens' ) ,
('SE', 'BD', 'Norrbottens län' ) ,
('SE', 'C', 'Uppsala län' ) ,
('SE', 'D', 'Södermanlands län' ) ,
('SE', 'E', 'Östergötland' ) ,
('SE', 'F', 'Jönköping' ) ,
('SE', 'BD', 'Norrbottens län' ) ,
('SE', 'C', 'Uppsala län' ) ,
('SE', 'D', 'Södermanlands län' ) ,
('SE', 'E', 'Östergötland' ) ,
('SE', 'F', 'Jönköping' ) ,
('SE', 'G', 'Kronoberg' ) ,
('SE', 'H', 'Kalmar' ) ,
('SE', 'I', 'Gotlands' ) ,
('SE', 'K', 'Blekinge' ) ,
('SE', 'M', 'Skåne' ) ,
('SE', 'M', 'Skåne' ) ,
('SE', 'N', 'Halland' ) ,
('SE', 'O', 'Västra Götaland' ) ,
('SE', 'S', 'Värmland' ) ,
('SE', 'T', 'Örebro' ) ,
('SE', 'U', 'Västmanland' ) ,
('SE', 'O', 'Västra Götaland' ) ,
('SE', 'S', 'Värmland' ) ,
('SE', 'T', 'Örebro' ) ,
('SE', 'U', 'Västmanland' ) ,
('SE', 'W', 'Dalarna' ) ,
('SE', 'X', 'Gävleborg' ) ,
('SE', 'Y', 'Västernorrland' ) ,
('SE', 'Z', 'Jämtland' ) ,
('SE', 'X', 'Gävleborg' ) ,
('SE', 'Y', 'Västernorrland' ) ,
('SE', 'Z', 'Jämtland' ) ,
('TR', '01', 'Adana' ) ,
('TR', '02', 'Adiyaman' ) ,
('TR', '03', 'Afyon' ) ,
@@ -1267,7 +1267,7 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('TR', '26', 'Eskisehir' ) ,
('TR', '27', 'Gaziantep' ) ,
('TR', '28', 'Giresun' ) ,
('TR', '29', 'Gümüşhane' ) ,
('TR', '29', 'Gümüşhane' ) ,
('TR', '30', 'Hakkari' ) ,
('TR', '31', 'Hatay' ) ,
('TR', '32', 'Isparta' ) ,
@@ -1281,7 +1281,7 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME) VALUES
('TR', '40', 'Kirsehir' ) ,
('TR', '41', 'Kocaeli' ) ,
('TR', '42', 'Konya' ) ,
('TR', '43', 'Kütahya' ) ,
('TR', '43', 'Kütahya' ) ,
('TR', '44', 'Malatya' ) ,
('TR', '45', 'Manisa' ) ,
('TR', '46', 'Kahramanmaras' ) ,
@@ -3413,7 +3413,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_INTERMEDIATE_MESSAGE_EVENT','en','Intermediate Message Events (Task Notifications)','2014-01-15') ,
( 'LABEL','ID_TEMPLATES','en','Templates','2014-01-15') ,
( 'LABEL','ID_PUBLIC','en','Public','2014-01-15') ,
( 'LABEL','ID_DELETE_INPUTDOCUMENT_CONFIRM','en','The item will be deleted the day of the work hour’s list. Do you want continue?','2014-10-21') ,
( 'LABEL','ID_DELETE_INPUTDOCUMENT_CONFIRM','en','The item will be deleted the day of the work hour’s list. Do you want continue?','2014-10-21') ,
( 'JAVASCRIPT','ID_SUBJECT_FIELD_REQUIRED','en','Subject Field is required.','2014-01-15') ,
( 'JAVASCRIPT','ID_MESSAGE_FIELD_REQUIRED','en','Message Field is required.','2014-01-15') ,
( 'JAVASCRIPT','ID_TEMPLATE_FIELD_REQUIRED','en','Template Field is required.','2014-01-15') ,
@@ -3639,7 +3639,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_NOT_WORKSPACE_SPECIFIED','en','No workspace specified!','2014-01-15') ,
( 'LABEL','ID_BAD_REQUEST','en','Bad Request!','2014-01-15') ,
( 'LABEL','ID_COLOSA_AND_CERTIFIED_PARTNERS','en','Supplied free of charge with no support, certification, warranty, maintenance nor indemnity by Colosa and its Certified Partners.','2014-10-21') ,
( 'LABEL','ID_COPYRIGHT','en','Copyright © 2003-2011 Colosa, Inc. All rights reserved.','2014-01-15') ,
( 'LABEL','ID_COPYRIGHT','en','Copyright © 2003-2011 Colosa, Inc. All rights reserved.','2014-01-15') ,
( 'LABEL','ID_LOGIN_WITH_FACEBOOK','en','Login with Facebook!!','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP6','en','xxx','2014-01-15') ,
( 'LABEL','ID_SIZE_VERY_LARGE_PERMITTED','en','The file is too large . Please upload a smaller file.','2014-10-08') ,
@@ -4048,7 +4048,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_ROUTING_SCREEN_TEMPLATE_DOES_NOT_EXIST','en','The routing screen template with {0}: {1} does not exist.','2014-05-20') ,
( 'LABEL','ID_RECORD_EXISTS_IN_TABLE','en','The record "{0}" exists in table {1}.','2014-10-21') ,
( 'LABEL','ID_RECORD_DOES_NOT_EXIST_IN_TABLE','en','The record "{0}", does not exist in table {1}.','2014-05-20') ,
( 'LABEL','ID_RECORD_CANNOT_BE_CREATED','en','The record couldn’t be created!','2014-10-21') ,
( 'LABEL','ID_RECORD_CANNOT_BE_CREATED','en','The record couldn’t be created!','2014-10-21') ,
( 'LABEL','ID_CASE_TRACKER_OBJECT_DOES_NOT_EXIST','en','The case tracker object with {0}: {1} does not exist.','2014-05-20') ,
( 'LABEL','ID_ATTRIBUTE_HAS_INVALID_ELEMENT_KEY','en','The attribute {0}, has an invalid element (incorrect keys).','2014-05-20') ,
( 'LABEL','ID_DYNAFORM_DOES_NOT_EXIST','en','The DynaForm with {0}: {1} does not exist.','2014-05-20') ,
@@ -14907,7 +14907,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('CZ','JRN','Jirny',' ','') ,
('CZ','JSN','Jesenik',' ','') ,
('CZ','JTV','JetYichov',' ','') ,
('CZ','KAD','Kadaň',' ','') ,
('CZ','KAD','Kadaň',' ','') ,
('CZ','KAP','Kaplice',' ','') ,
('CZ','KAR','Karlin',' ','') ,
('CZ','KCC','Klasterec nad Orlici',' ','') ,
@@ -14937,7 +14937,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('CZ','KSL','Kostelec nad Labem',' ','') ,
('CZ','KST','Kostomlatky',' ','') ,
('CZ','KSV','Kamenicky Senov',' ','') ,
('CZ','KTA','Košťálov',' ','') ,
('CZ','KTA','Košťálov',' ','') ,
('CZ','KTV','Klatovy',' ','') ,
('CZ','KUH','Kutna Hora',' ','') ,
('CZ','KUN','Kunovice',' ','') ;
@@ -15145,7 +15145,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('CZ','SUS','Susice',' ','') ,
('CZ','SVK','Svaty Kriz',' ','') ,
('CZ','SVO','Straskov',' ','') ,
('CZ','SVR','Svrkyně',' ','') ,
('CZ','SVR','SvrkynÄ›',' ','') ,
('CZ','SZA','Strazny',' ','') ,
('CZ','TAC','Tachov',' ','') ,
('CZ','TAS','Tynec nad Sazavou',' ','') ,
@@ -15180,7 +15180,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('CZ','VCH','Vysoky Chlumec',' ','') ,
('CZ','VCR','Volduchy',' ','') ,
('CZ','VEA','Ceske Velenice',' ','') ,
('CZ','VEB','Velká Bíteš',' ','') ,
('CZ','VEB','Velká Bíteš',' ','') ,
('CZ','VEL','Veletov',' ','') ,
('CZ','VFA','Varnsdorf',' ','') ,
('CZ','VIM','Vimperk',' ','') ;
@@ -23197,7 +23197,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('FR','FDO','Fours',' ','33') ,
('FR','FDS','Fondettes',' ','37') ,
('FR','FDU','Ferdrupt',' ','88') ,
('FR','FEA','Ferrières-en-Gâtinais',' ','45') ,
('FR','FEA','Ferrières-en-Gâtinais',' ','45') ,
('FR','FEC','Fecamp',' ','76') ,
('FR','FEE','Fresse',' ','70') ,
('FR','FEG','Fegersheim',' ','67') ,
@@ -31025,7 +31025,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('HR','BVA','Brezovica',' ','') ,
('HR','BVO','Baska Voda',' ','') ,
('HR','BZA','Bozava',' ','') ,
('HR','CAK','Čakovec',' ','') ,
('HR','CAK','ÄŒakovec',' ','') ,
('HR','CRA','Crikvenica',' ','') ,
('HR','CRS','Cres',' ','') ,
('HR','CVT','Cavtat',' ','') ,
@@ -31047,8 +31047,8 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('HR','GCN','Gorican',' ','') ,
('HR','GNA','Gazenica',' ','') ,
('HR','GOM','Gomirje',' ','') ,
('HR','GRA','Gračac',' ','') ,
('HR','GSP','Gospić',' ','') ,
('HR','GRA','GraÄ<EFBFBD>ac',' ','') ,
('HR','GSP','Gospić',' ','') ,
('HR','HLE','Hrvatski Leskovac',' ','') ,
('HR','HVA','Hvar',' ','') ,
('HR','ILO','Ilok',' ','') ,
@@ -31089,7 +31089,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('HR','MAS','Maslenica',' ','') ,
('HR','MAV','Martinska Ves Desna',' ','') ,
('HR','MCC','Macinec',' ','') ,
('HR','MET','Metković',' ','') ,
('HR','MET','Metković',' ','') ,
('HR','MHV','Mohovo',' ','') ,
('HR','MIL','Milna',' ','') ,
('HR','MNK','Misnjak',' ','') ,
@@ -31118,7 +31118,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('HR','OPT','Opatovac',' ','') ,
('HR','ORB','Orebic',' ','') ,
('HR','OSI','Osijek',' ','') ,
('HR','OTO','Otočac',' ','') ,
('HR','OTO','OtoÄ<EFBFBD>ac',' ','') ,
('HR','OVA','Orahovica',' ','') ,
('HR','OVC','Oriovac',' ','') ,
('HR','PAG','Pag',' ','') ,
@@ -31157,7 +31157,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('HR','SBC','Stobrec',' ','') ,
('HR','SBD','Slavonski Brod',' ','') ,
('HR','SBR','Sobra',' ','') ,
('HR','SDA','Satnica Đakovačka',' ','') ,
('HR','SDA','Satnica Ä<EFBFBD>akovaÄ<EFBFBD>ka',' ','') ,
('HR','SDR','Sudurad',' ','') ,
('HR','SEN','Senj',' ','') ,
('HR','SGA','Strigova',' ','') ,
@@ -31344,7 +31344,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('HU','HER','Hercegszanto',' ','') ,
('HU','HEV','Heves',' ','') ,
('HU','HIS','Hidasnemeti',' ','') ,
('HU','HMV','Hódmezővásárhely',' ','') ,
('HU','HMV','Hódmezővásárhely',' ','') ,
('HU','HRY','Hater',' ','') ,
('HU','IPO','Ipolytarnoc',' ','') ,
('HU','IPS','Ipolytolgyes',' ','') ,
@@ -31367,7 +31367,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('HU','KIA','Kisvarda',' ','') ,
('HU','KIS','Kiskunfelegyhaza',' ','') ,
('HU','KIT','Kistarcsa',' ','') ,
('HU','KKS','Kiskőrös',' ','') ,
('HU','KKS','Kiskőrös',' ','') ,
('HU','KLK','Kistelek',' ','') ,
('HU','KMD','Kunmadaras',' ','') ,
('HU','KMJ','Kiskunmajsa',' ','') ,
@@ -37925,7 +37925,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('LV','ASE','Aluksne',' ','AL') ,
('LV','AUC','Auce',' ','DO') ,
('LV','BAU','Bauska',' ','BU') ,
('LV','BRC','Brocēni',' ','SA') ,
('LV','BRC','Brocēni',' ','SA') ,
('LV','BZC','Briezuciems',' ','BL') ,
('LV','CES','Cesis',' ','CE') ,
('LV','DGP','Daugavpils',' ','DW') ,
@@ -38068,7 +38068,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('MD','RIB','Ribnita',' ','') ,
('MD','TIR','Tiraspol',' ','') ,
('MD','UNG','Ungeny',' ','') ,
('MD','VUL','Vulcăneşti',' ','') ,
('MD','VUL','Vulcăneşti',' ','') ,
('ME','','',' ','') ,
('ME','BAR','Bar',' ','') ,
('ME','BIJ','Bijela',' ','') ,
@@ -38391,7 +38391,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('MT','PAO','Paola',' ','') ,
('MT','RMI','Qormi',' ','') ,
('MT','SGW','San A Wann, Valletta',' ','') ,
('MT','SJN','San Julián (St Julian)',' ','') ,
('MT','SJN','San Julián (St Julian)',' ','') ,
('MT','SPB','St Paul''s Bay (San Paul il-Bahir)',' ','') ,
('MU','','',' ','') ,
('MU','CDE','Cloverdale',' ','') ,
@@ -42559,8 +42559,8 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('PL','BAP','Biala Podlaska',' ','') ,
('PL','BAR','Bartoszyce',' ','') ,
('PL','BCA','Bochnia',' ','') ,
('PL','BED','Będzin',' ','') ,
('PL','BEL','Bełżyce',' ','') ,
('PL','BED','Będzin',' ','') ,
('PL','BEL','Bełżyce',' ','') ,
('PL','BGA','Boguchwala',' ','') ;
INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('PL','BGW','BoguchwaBa',' ','') ,
@@ -42626,7 +42626,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('PL','DKA','Debnica Kaszubska',' ','') ,
('PL','DNW','Dobrzyn nad Wisla',' ','') ,
('PL','DOK','Dobrzyniewo Koscielne',' ','') ,
('PL','DOL','Dołuje Mierzyn',' ','') ,
('PL','DOL','Dołuje Mierzyn',' ','') ,
('PL','DUS','Duszniki Zdroj',' ','') ,
('PL','DZE','Dobrzykowice Wroclawskie',' ','') ,
('PL','DZI','Dzialdowo',' ','') ,
@@ -42711,7 +42711,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('PL','KAZ','Kazimierz',' ','') ,
('PL','KCL','Kucelinska',' ','') ,
('PL','KCN','Krasocin',' ','') ,
('PL','KEK','Kędzierzyn-',' ','') ,
('PL','KEK','Kędzierzyn-',' ','') ,
('PL','KEP','Kepno',' ','') ,
('PL','KIJ','Kijow',' ','') ,
('PL','KKE','Krapkowice',' ','') ,
@@ -42819,7 +42819,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('PL','MIC','Miechow',' ','') ,
('PL','MID','Miedzyzdroje',' ','') ,
('PL','MIE','Michalowice',' ','') ,
('PL','MIK','Mikołów',' ','') ,
('PL','MIK','Mikołów',' ','') ,
('PL','MIN','Minsk Mazowiecki',' ','') ,
('PL','MIR','Mirkow',' ','') ,
('PL','MKI','Marki',' ','') ,
@@ -43000,7 +43000,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('PL','SKP','Skopanie',' ','') ,
('PL','SKW','Skwierzyna',' ','') ,
('PL','SKZ','Skalmierzyce',' ','') ,
('PL','SLA','Sławno',' ','') ,
('PL','SLA','SÅ‚awno',' ','') ,
('PL','SLC','Slupca',' ','') ,
('PL','SLE','Slubice, Mazowieckie',' ','') ,
('PL','SLP','Slupsk',' ','') ,
@@ -43030,7 +43030,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('PL','STD','Starogard',' ','') ,
('PL','STE','Starachowice',' ','') ,
('PL','STG','Starogard Gdanski',' ','') ,
('PL','STJ','Stare Jeżewo',' ','') ,
('PL','STJ','Stare Jeżewo',' ','') ,
('PL','STM','Stare Miasto',' ','') ,
('PL','STN','Straszyn',' ','') ,
('PL','STP','Stare Pole',' ','') ,
@@ -43152,7 +43152,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('PL','ZGZ','Zagorz',' ','') ,
('PL','ZIE','Ziebice',' ','') ,
('PL','ZIL','Zielonka',' ','') ,
('PL','ZKW','Żyraków',' ','') ,
('PL','ZKW','Żyraków',' ','') ,
('PL','ZLA','Zolynia',' ','') ,
('PL','ZLO','Zlotow',' ','') ,
('PL','ZNI','Znin',' ','') ,
@@ -43921,7 +43921,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('RO','CCA','Carcea',' ','') ,
('RO','CCI','Clinceni',' ','') ,
('RO','CCL','Caracal',' ','') ,
('RO','CDA','Curtea de Argeș',' ','') ,
('RO','CDA','Curtea de ArgeÈ™',' ','') ,
('RO','CEV','Cernavoda',' ','') ,
('RO','CJA','Chiajna',' ','') ,
('RO','CLA','Codlea',' ','') ,
@@ -43952,7 +43952,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('RO','DCU','Dascalu',' ','') ,
('RO','DEJ','Dej',' ','') ,
('RO','DHO','Dorohoi',' ','') ,
('RO','DIM','Dâmbovița',' ','') ,
('RO','DIM','Dâmbovița',' ','') ,
('RO','DOR','Dornesti',' ','') ,
('RO','DSI','Dragasani',' ','') ,
('RO','DTS','Drobeta Turnu Severin',' ','') ,
@@ -44045,7 +44045,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('RO','PCI','Pascani',' ','') ,
('RO','PDM','Poienarii de Muscel',' ','') ,
('RO','PEI','Petrosani',' ','') ,
('RO','PET','Petroșani',' ','') ,
('RO','PET','Petroșani',' ','') ,
('RO','PFD','Portile de Fier Doi',' ','') ,
('RO','PFU','Portile de Fier Unu',' ','') ,
('RO','PIA','Piatra Olt',' ','') ,
@@ -46708,7 +46708,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('TR','MFZ','Mersin-Free Zone',' ','33') ,
('TR','MHM','Mahmudiye',' ','26') ,
('TR','MIL','Milas',' ','48') ,
('TR','MKP','Mustafakemalpaşa',' ','16') ,
('TR','MKP','MustafakemalpaÅŸa',' ','16') ,
('TR','MLK','Malkara',' ','59') ,
('TR','MLX','Malatya',' ','44') ,
('TR','MNM','Menemen',' ','35') ,
@@ -46799,7 +46799,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('TR','SRG','Sarigazi',' ','34') ,
('TR','SRK','Sarkoy',' ','59') ,
('TR','SRN','Sirinevler',' ','34') ,
('TR','SRS','Samandağ',' ','31') ,
('TR','SRS','SamandaÄŸ',' ','31') ,
('TR','SRY','Sariyer',' ','34') ,
('TR','SSL','Susurluk',' ','10') ,
('TR','SSX','Samsun',' ','55') ,
@@ -59943,3 +59943,19 @@ INSERT INTO DASHLET_INSTANCE (DAS_INS_UID,DAS_UID,DAS_INS_OWNER_TYPE,DAS_INS_OWN
INSERT INTO CONFIGURATION (CFG_UID,OBJ_UID,CFG_VALUE,PRO_UID,USR_UID,APP_UID) VALUES
('ENVIRONMENT_SETTINGS','','a:1:{s:18:"directoryStructure";i:2;}','','','');
INSERT INTO CATALOG (CAT_UID, CAT_LABEL_ID, CAT_TYPE, CAT_FLAG, CAT_OBSERVATION, CAT_CREATE_DATE, CAT_UPDATE_DATE) VALUES
('10','ID_BARS','GRAPHIC','','','2015-03-04','2015-03-04'),
('20','ID_LINES','GRAPHIC','','','2015-03-04','2015-03-04'),
('100','ID_MONTH','PERIODICITY','','','2015-03-04','2015-03-04'),
('200','ID_QUARTER','PERIODICITY','','','2015-03-04','2015-03-04'),
('300','ID_SEMESTER','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'),
('1020','ID_PROCESS_INEFFICIENCE','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'),
('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');

9
workflow/engine/menus/processmaker.php
View File

@@ -51,7 +51,16 @@ if ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') ==
$G_TMP_MENU->AddIdRawOption('SETUP', 'setup/main', G::LoadTranslation('ID_SETUP'), '', '', '', 'x-pm-setup');
}
/*----------------------------------********---------------------------------*/
// NEW DASHBOARD MODULE
$licensedFeatures = & PMLicensedFeatures::getSingleton();
if ($licensedFeatures->verifyfeature('bvZTnIraUhCSXIxNEVOcGluVVR6Y3E3NStiMW9tWU54aU5tb0FrRnJ0MXMzLzRWMHZtakJIN3dRPT0=') && ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') == 1)) {
$G_TMP_MENU->AddIdRawOption('DASHBOARD+', 'strategicDashboard/main', G::LoadTranslation('ID_DASHBOARD'), '', '', '', 'x-pm-dashboard');
}
/*----------------------------------********---------------------------------*/
// PLUGINS MENUS
if( file_exists(PATH_CORE . 'menus/plugin.php') ) {
require_once(PATH_CORE . 'menus/plugin.php');
}

9
workflow/engine/menus/setup.php
View File

@@ -72,6 +72,14 @@ if ($RBAC->userCanAccess('PM_SETUP') == 1) {
}
$G_TMP_MENU->AddIdRawOption('LOGIN', 'loginSettings', G::LoadTranslation('LOGIN'), "",'', 'settings');
$G_TMP_MENU->AddIdRawOption('DASHBOARD', '../dashboard/dashletsList', ucfirst(G::LoadTranslation('ID_DASHBOARD')), '', '', 'settings');
/*----------------------------------********---------------------------------*/
if ($licensedFeatures->verifyfeature('bvZTnIraUhCSXIxNEVOcGluVVR6Y3E3NStiMW9tWU54aU5tb0FrRnJ0MXMzLzRWMHZtakJIN3dRPT0=')) {
$G_TMP_MENU->AddIdRawOption('NEW_DASHBOARD', '../strategicDashboard/dashboardList', ucfirst(G::LoadTranslation('ID_STRATEGIC_DASHBOARD')), '', '', 'settings');
}
/*----------------------------------********---------------------------------*/
}
//tools options
if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1 ) {
@@ -150,4 +158,3 @@ if ($RBAC->userCanAccess("PM_SETUP") == 1) {
/*----------------------------------********---------------------------------*/
$G_TMP_MENU->AddIdRawOption("CASES_LIST_SETUP", "../cases/casesListSetup", G::LoadTranslation('ID_CASES_LIST'), "", "", "settings");
}

6
workflow/engine/src/ProcessMaker/Services/api.ini
View File

@@ -103,3 +103,9 @@ debug = 1
[alias: consolidated]
list = "ProcessMaker\Services\Api\Consolidated"
[alias: dashboard]
dashboard = "ProcessMaker\Services\Api\Dashboard"
[alias: catalog]
dashboard = "ProcessMaker\Services\Api\Catalog"