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

Merged in darojas/processmaker/master-core (pull request #1280)

Browse Source 
PM-1117 Paused Case - SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2014-12-16 09:43:58 -04:00
parent 9e878cc516 f712cb4468
commit ee1ce8d278
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
workflow/engine/templates/cases/casesList.js Normal file → Executable file
View File

@@ -25,17 +25,33 @@ var textJump;
var ids = ''; var ids = '';
var winReassignInCasesList; var winReassignInCasesList;
function formatAMPM(date, initVal) { function formatAMPM(date, initVal, calendarDate) {
var hours = date.getHours();
var minutes = (initVal === true)? ((date.getMinutes()<15)? 0: ((date.getMinutes()<30)? 15: ((date.getMinutes()<45)? 30: 45))): date.getMinutes(); var currentDate = new Date();
var ampm = hours >= 12 ? 'PM' : 'AM'; var currentDay = currentDate.getDate();
hours = hours % 12; var currentMonth = currentDate.getMonth()+1;
hours = hours ? hours : 12; // the hour '0' should be '12' if (currentDay < 10) {
minutes = minutes < 10 ? '0' + minutes : minutes; currentDay = '0' + currentDay;
var strTime = hours + ':' + minutes + ' ' + ampm; }
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; return strTime;
} }
Ext.Ajax.timeout = 4 * 60 * 1000; Ext.Ajax.timeout = 4 * 60 * 1000;
var caseSummary = function() { var caseSummary = function() {
@@ -248,13 +264,14 @@ function pauseCase(date){
items: [ items: [
{ {
html: '<div align="center" style="font: 14px tahoma,arial,helvetica,sans-serif">' + _('ID_PAUSE_CASE_TO_DATE') +' '+date.format('M j, Y')+'? </div> <br/>' html: '<div align="center" style="font: 14px tahoma,arial,helvetica,sans-serif">' + _('ID_PAUSE_CASE_TO_DATE') +' '+date.format('M j, Y')+'? </div> <br/>'
}, },
new Ext.form.TimeField({ new Ext.form.TimeField({
id: 'unpauseTime', id: 'unpauseTime',
fieldLabel: _('ID_UNPAUSE_TIME'), fieldLabel: _('ID_UNPAUSE_TIME'),
name: 'unpauseTime', name: 'unpauseTime',
value: formatAMPM(new Date(), false), value: formatAMPM(new Date(), false, date.format('m-d')),
minValue: formatAMPM(new Date(), true), minValue: formatAMPM(new Date(), true, date.format('m-d')),
format: 'h:i A' format: 'h:i A'
}), }),
{ {