Changeset 5825
- Timestamp:
- 03/27/12 09:55:17 (12 years ago)
- Location:
- trunk/prototype/modules/mail
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/mail/js/followupflag.js
r5817 r5825 200 200 alarmDate.set({hour:alarmTime.getHours(), minute:alarmTime.getMinutes()}); 201 201 } 202 followupflagged.alarmDeadline = alarmDate.toString('yyyy-MM-dd hh:mm:ss');202 followupflagged.alarmDeadline = alarmDate.toString('yyyy-MM-dd HH:mm:ss'); 203 203 } 204 204 … … 207 207 doneDate.set({hour:doneTime.getHours(), minute:doneTime.getMinutes()}); 208 208 } 209 followupflagged.doneDeadline = doneDate.toString('yyyy-MM-dd hh:mm:ss');209 followupflagged.doneDeadline = doneDate.toString('yyyy-MM-dd HH:mm:ss'); 210 210 } 211 211 … … 442 442 if(alarmInRange.length > 0){ 443 443 for(var i=0; i<alarmInRange.length; i++){ 444 var date = Date.parseExact(alarmInRange[i][it.attrDeadline], 'yyyy-MM-dd hh:mm:ss');445 alarmInRange[i][it.attrDeadline] = date.toString(' hh:mm');444 var date = Date.parseExact(alarmInRange[i][it.attrDeadline], 'yyyy-MM-dd HH:mm:ss'); 445 alarmInRange[i][it.attrDeadline] = date.toString('HH:mm'); 446 446 } 447 447 var caption = (alarmInRange.length == 1) ? -
trunk/prototype/modules/mail/templates/followupflag_configure.ejs
r5738 r5825 4 4 var followupflagged = data.messages[0].followupflagged ? data.messages[0].followupflagged : { followupflag: {id: 1} }; 5 5 if (followupflagged.doneDeadline) 6 followupflagged.doneDeadline = Date.parseExact(followupflagged.doneDeadline, 'yyyy-MM-dd hh:mm:ss');6 followupflagged.doneDeadline = Date.parseExact(followupflagged.doneDeadline, 'yyyy-MM-dd HH:mm:ss'); 7 7 if (followupflagged.alarmDeadline) 8 followupflagged.alarmDeadline = Date.parseExact(followupflagged.alarmDeadline, 'yyyy-MM-dd hh:mm:ss');8 followupflagged.alarmDeadline = Date.parseExact(followupflagged.alarmDeadline, 'yyyy-MM-dd HH:mm:ss'); 9 9 10 10 } else if (data.messages.length > 1) { … … 70 70 <input type="checkbox" name="alarm" <%=(followupflagged.alarmDeadline) ? 'checked="checked"' : '' %> /><label><%= get_lang("Alarm")%>: </label> 71 71 <input type="text" name="alarmDate" class="date" size="12" value="<%=(followupflagged.alarmDeadline) ? followupflagged.alarmDeadline.toString('dd/MM/yyyy') : '' %>" /> ás 72 <input type="text" name="alarmTime" class="time" size="8" value="<%=(followupflagged.alarmDeadline) ? followupflagged.alarmDeadline.toString(' hh:mm') : '' %>" />72 <input type="text" name="alarmTime" class="time" size="8" value="<%=(followupflagged.alarmDeadline) ? followupflagged.alarmDeadline.toString('HH:mm') : '' %>" /> 73 73 </div> 74 74 <div class="completed-followup"> … … 79 79 <label><%= get_lang("Conclusion")%>:</label> 80 80 <input <%=(followupflagged.isDone && followupflagged.isDone != '0') ? 'disabled="disabled"' : '' %> type="text" name="doneDate" class="date" size="12" value="<%=(followupflagged.doneDeadline) ? followupflagged.doneDeadline.toString('dd/MM/yyyy') : '' %>" /> ás 81 <input <%=(followupflagged.isDone && followupflagged.isDone != '0') ? 'disabled="disabled"' : '' %> type="text" name="doneTime" class="time" size="8" value="<%=(followupflagged.doneDeadline) ? followupflagged.doneDeadline.toString(' hh:mm') : '' %>" />81 <input <%=(followupflagged.isDone && followupflagged.isDone != '0') ? 'disabled="disabled"' : '' %> type="text" name="doneTime" class="time" size="8" value="<%=(followupflagged.doneDeadline) ? followupflagged.doneDeadline.toString('HH:mm') : '' %>" /> 82 82 </div> 83 83 </fieldset>
Note: See TracChangeset
for help on using the changeset viewer.