BUG 11060 "Date time picker con hora habilitado no..." SOLVED

- Date time picker con hora habilitado no funciona apropiadamente (bug 11060) - El Datepicker no se muestra de manera correcta (bug 11225) - Solved problem, with reference to bug 11060, added button "Done" when time is displayed - Solved problem, with reference to bug 11225 * Available from version ProcessMaker-2.5.1-testing.2
2013-05-24 13:28:49 -04:00
parent cdef8c3703
commit 59e37602d6
18 changed files with 229 additions and 41 deletions
--- a/gulliver/js/common/core/common.js
+++ b/gulliver/js/common/core/common.js
@@ -2021,6 +2021,8 @@ function removeValue(id){
  fireEvent(document.getElementById(id), 'change');
 }

+var countButtonDone = 0;
+
 function datePicker4(obj, id, mask, startDate, endDate, showTIme, idIsoDate)
 {
    var aux = id.replace(/[\[\]]/g, '_');
@@ -2030,6 +2032,8 @@ function datePicker4(obj, id, mask, startDate, endDate, showTIme, idIsoDate)
    showTIme = false;
  }

+  countButtonDone = countButtonDone + 1;
+
  Calendar.setup({
    inputField: id,
    dateFormat: mask,
@@ -2039,15 +2043,53 @@ function datePicker4(obj, id, mask, startDate, endDate, showTIme, idIsoDate)
    max:endDate,
    animation: _BROWSER.name =='msie'? false: true,
    showTime: showTIme,
+    showButtonDone: (showTIme)? 1 : 0,
+    iButtonDone: countButtonDone,
    opacity: 1,
-    onSelect: function() {
-        this.hide();
+    onSelect: function ()
+    {
        /* disabled temporarily by wrong functionality
        auxid     = id;
        idIsoDate = auxid.substring(0,auxid.length-1)+'_isodate]';
        var field= document.getElementById(idIsoDate);
        field.value=this.selection.print("%Y-%m-%d", ""); */
-        fireEvent(document.getElementById(id), 'change');
+
+        if (!this.args.showButtonDone || this.args.showButtonDone == 0) {
+            this.hide();
+
+            fireEvent(document.getElementById(id), "change");
+        }
+    },
+    onFocus: function ()
+    {
+        if (this.args.showButtonDone && this.args.showButtonDone == 1) {
+            var thisAux = this;
+
+            document.getElementById("btnDone" + thisAux.args.iButtonDone).onclick = function ()
+            {
+                var v;
+
+                if (thisAux.selection.sel.length == 0) {
+                    //thisAux.args.showTime //default false //true for 24h //12 for am/pm
+
+                    if (thisAux.args.showTime) {
+                        thisAux.date.setHours(thisAux.selection.cal.getHours());
+                        thisAux.date.setMinutes(thisAux.selection.cal.getMinutes());
+                    }
+
+                    v = Calendar.printDate(Calendar.intToDate(thisAux.date), thisAux.args.dateFormat);
+                } else {
+                    v = thisAux.selection.print(thisAux.args.dateFormat);
+                }
+
+                document.getElementById(thisAux.args.inputField).value = v;
+
+                //Event
+                thisAux.hide();
+
+                fireEvent(document.getElementById(id), "change");
+            };
+        }
    }
  });
 }
@@ -2140,7 +2182,7 @@ function __()
        eval("trn = TRANSLATIONS_" + argv[0].toUpperCase() + "[argv[0]];");
        for (i = 2; i < argv.length; i++) {
          trn = trn.replace('{'+(i-2)+'}', argv[i]);
-        }        
+        }
      } else {
        eval("trn = TRANSLATIONS_" + argv[0].toUpperCase() + "[argv[1]];");
      }
--- a/gulliver/js/maborak/core/maborak.js
+++ b/gulliver/js/maborak/core/maborak.js
--- a/gulliver/js/widgets/js-calendar/js-calendar.js
+++ b/gulliver/js/widgets/js-calendar/js-calendar.js
--- a/gulliver/js/widgets/js-calendar/lang/ca.js
+++ b/gulliver/js/widgets/js-calendar/lang/ca.js
@@ -10,6 +10,7 @@ Calendar.LANG("ca", "Catalan", {
    mn : [ "gener","febrer","març","abril","maig","juny","juliol","agost","setembre","octubre","novembre","desembre" ],
    smn : [ "gen","feb","mar","abr","mai","jun","jul","ago","set","oct","nov","des" ],
    dn : [ "diumenge","dilluns","dimarts","dimecres","dijous","divendres","dissabte","diumenge" ],
-    sdn : [ "dg","dl","dt","dc","dj","dv","ds","dg" ]
+    sdn : [ "dg","dl","dt","dc","dj","dv","ds","dg" ],
+    done: "Fet" //Appears in bottom bar
 });
 }
--- a/gulliver/js/widgets/js-calendar/lang/cn.js
+++ b/gulliver/js/widgets/js-calendar/lang/cn.js
@@ -10,6 +10,7 @@ Calendar.LANG("cn", "中文", {
        mn : [ "一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
        smn : [ "一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
        dn : [ "日", "一", "二", "三", "四", "五", "六", "日" ],
-        sdn : [ "日",  "一",  "二",  "三",  "四",  "五",  "六",  "日" ]
+        sdn : [ "日",  "一",  "二",  "三",  "四",  "五",  "六",  "日" ],
+        done: "完成" //Appears in bottom bar
 });
 }
--- a/gulliver/js/widgets/js-calendar/lang/cz.js
+++ b/gulliver/js/widgets/js-calendar/lang/cz.js
@@ -10,6 +10,7 @@ Calendar.LANG("cz", "Czech", {
        mn : [ "Leden","Únor","Březen","Duben","Květen","Červen","Červenec","Srpen","Září","Říjen","Listopad","Prosinec" ],
        smn : [ "Led", "Úno", "Bře", "Dub", "Kvě", "Črn", "Črc", "Srp", "Zář", "Říj", "Lis", "Pro" ],
        dn : [ "Neděle","Pondělí","Úterý","Středa","Čtvrtek","Pátek","Sobota","Neděle" ],
-        sdn : [ "Ne", "Po", "Út", "St", "Čt", "Pá", "So", "Ne" ]
+        sdn : [ "Ne", "Po", "Út", "St", "Čt", "Pá", "So", "Ne" ],
+        done: "Hotový" //Appears in bottom bar
 });
 }
--- a/gulliver/js/widgets/js-calendar/lang/de.js
+++ b/gulliver/js/widgets/js-calendar/lang/de.js
@@ -10,6 +10,7 @@ Calendar.LANG("de", "Deutsch", {
        mn : [ "Januar","Februar","M\u00e4rz","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember" ],
        smn : [ "Jan", "Feb", "M\u00e4r", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez" ],
        dn : [ "Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag","Sonntag" ],
-        sdn : [ "So", "Mo", "Di", "Mi", "Do", "Fr", "Sa", "So" ]
+        sdn : [ "So", "Mo", "Di", "Mi", "Do", "Fr", "Sa", "So" ],
+        done: "Geschehen" //Appears in bottom bar
 });
 }
--- a/gulliver/js/widgets/js-calendar/lang/en.js
+++ b/gulliver/js/widgets/js-calendar/lang/en.js
@@ -10,6 +10,7 @@ Calendar.LANG("en", "English", {
  mn : [ "January","February","March","April","May","June","July","August","September","October","November","December" ],
  smn : [ "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec" ],
  dn : [ "Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday" ],
-  sdn : [ "Su","Mo","Tu","We","Th","Fr","Sa","Su" ]
+  sdn : [ "Su","Mo","Tu","We","Th","Fr","Sa","Su" ],
+  done: "Done" //Appears in bottom bar
 });
 }
--- a/gulliver/js/widgets/js-calendar/lang/es.js
+++ b/gulliver/js/widgets/js-calendar/lang/es.js
@@ -10,6 +10,7 @@ if (typeof Calendar!='undefined' ) {
        mn : [ "Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre" ],
        smn : [ "Ene", "Feb", "Mar", "Abr", "May", "Jun", "Jul", "Ago", "Sep", "Oct", "Nov", "Dic" ],
        dn : [ "Domingo","Lunes","Martes","Miercoles","Jueves","Viernes","Sabado","Domingo" ],
-        sdn : [ "Do", "Lu", "Ma", "Mi", "Ju", "Vi", "Sa", "Do" ]
+        sdn : [ "Do", "Lu", "Ma", "Mi", "Ju", "Vi", "Sa", "Do" ],
+        done: "Hecho" //Appears in bottom bar
 });
 }
--- a/gulliver/js/widgets/js-calendar/lang/fr.js
+++ b/gulliver/js/widgets/js-calendar/lang/fr.js
@@ -10,6 +10,7 @@ Calendar.LANG("fr", "Français", {
        mn : [ "Janvier","Février","Mars","Avril","Mai","Juin","Juillet","Août","Septembre","Octobre","Novembre","Décembre" ],
        smn : [ "Jan","Fév","Mar","Avr","Mai","Juin","Juil","Aou","Sep","Oct","Nov","Déc" ],
        dn : [ "Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi","Dimanche" ],
-        sdn : [ "Di","Lu","Ma","Me","Je","Ve","Sa","Di" ]
+        sdn : [ "Di","Lu","Ma","Me","Je","Ve","Sa","Di" ],
+        done: "Fait" //Appears in bottom bar
 });
 }
--- a/gulliver/js/widgets/js-calendar/lang/it.js
+++ b/gulliver/js/widgets/js-calendar/lang/it.js
@@ -10,6 +10,7 @@ if (typeof Calendar!='undefined' ) {
        mn : [ "Gennaio","Febbraio","Marzo","Aprile","Maggio","Giugno","Luglio","Agosto","Settembre","Ottobre","Novembre","Dicembre" ],
        smn : [ "Gen","Feb","Mar","Apr","Mag","Giu","Lug","Ago","Set","Ott","Nov","Dic" ],
        dn : [ "Domenica","Lunedì","Martedì","Mercoledì","Giovedi","Venerdì","Sabato","Domenica" ],
-        sdn : [ "Do","Lu","Ma","Me","Gi","Ve","Sa","Do" ]
+        sdn : [ "Do","Lu","Ma","Me","Gi","Ve","Sa","Do" ],
+        done: "Fatto" //Appears in bottom bar
 });
 }
--- a/gulliver/js/widgets/js-calendar/lang/jp.js
+++ b/gulliver/js/widgets/js-calendar/lang/jp.js
@@ -10,6 +10,7 @@ if (typeof Calendar!='undefined' ) {
        mn : [ "1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月" ],
        smn : [ "1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月" ],
        dn : [ "日曜日","月曜日","火曜日","水曜日","木曜日","金曜日","土曜日","日曜日" ],
-        sdn : [ "日","月","火","水","木","金","土","日" ]
+        sdn : [ "日","月","火","水","木","金","土","日" ],
+        done: "完了" //Appears in bottom bar
 });
 }
--- a/gulliver/js/widgets/js-calendar/lang/nl.js
+++ b/gulliver/js/widgets/js-calendar/lang/nl.js
@@ -10,6 +10,7 @@ if (typeof Calendar!='undefined' ) {
        mn : [ "Januari","Februari","Maart","April","Mei","Juni","Juli","Augustus","September","Oktober","November","December" ],
        smn : [ "Jan", "Feb", "Maa", "Apr", "Mei", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec" ],
        dn : [ "Zondag","Maandag","Dinsdag","Woensdag","Donderdag","Vrijdag","Zaterdag","Zondag" ],
-        sdn : [ "Zo", "Ma", "Di", "Wo", "Do", "Vr", "Za", "Zo" ]
+        sdn : [ "Zo", "Ma", "Di", "Wo", "Do", "Vr", "Za", "Zo" ],
+        done: "Gedaan" //Appears in bottom bar
 });
 }
--- a/gulliver/js/widgets/js-calendar/lang/pl.js
+++ b/gulliver/js/widgets/js-calendar/lang/pl.js
@@ -10,6 +10,7 @@ if (typeof Calendar!='undefined' ) {
        mn : [ "Styczeń","Luty","Marzec","Kwiecień","Maj","Czerwiec","Lipiec","Sierpień","Wrzesień","Październik","Listopad","Grudzień" ],
        smn : [ "Sty", "Lut", "Mar", "Kwi", "Maj", "Cze", "Lip", "Sie", "Wrz", "Paź", "Lis", "Gru" ],
        dn : [ "Niedziela","Poniedziałek","Wtorek","Środa","Czwartek","Piątek","Sobota","Niedziela" ],
-        sdn : [ "Ni","Po","Wt","Śr","Cz","Pi","So","Ni" ]
+        sdn : [ "Ni","Po","Wt","Śr","Cz","Pi","So","Ni" ],
+        done: "Sporządzono" //Appears in bottom bar
 });
 }
--- a/gulliver/js/widgets/js-calendar/lang/pt.js
+++ b/gulliver/js/widgets/js-calendar/lang/pt.js
@@ -10,6 +10,7 @@ if (typeof Calendar!='undefined' ) {
        mn : [ "Janeiro","Fevereiro","Março","Abril","Maio","Junho","Julho","Agosto","Setembro","Outubro","Novembro","Dezembro" ],
        smn : [ "Jan","Fev","Mar","Abr","Mai","Jun","Jul","Ago","Set","Out","Nov","Dez" ],
        dn : [ "Domingo","Segunda","Terça","Quarta","Quinta","Sexta","Sábado","Domingo" ],
-        sdn : [ "Dom","Seg","Ter","Qua","Qui","Sex","Sab","Dom" ]
+        sdn : [ "Dom","Seg","Ter","Qua","Qui","Sex","Sab","Dom" ],
+        done: "Feito" //Appears in bottom bar
 });
 }
--- a/gulliver/js/widgets/js-calendar/lang/ro.js
+++ b/gulliver/js/widgets/js-calendar/lang/ro.js
@@ -10,6 +10,7 @@ Calendar.LANG("ro", "Română", {
        mn : [ "Ianuarie","Februarie","Martie","Aprilie","Mai","Iunie","Iulie","August","Septembrie","Octombrie","Noiembrie","Decembrie" ],
        smn : [ "Ian","Feb","Mar","Apr","Mai","Iun","Iul","Aug","Sep","Oct","Noi","Dec" ],
        dn : [ "Duminică","Luni","Marţi","Miercuri","Joi","Vineri","Sâmbătă","Duminică" ],
-        sdn : [ "Du","Lu","Ma","Mi","Jo","Vi","Sâ","Du" ]
+        sdn : [ "Du","Lu","Ma","Mi","Jo","Vi","Sâ","Du" ],
+        done: "Făcut" //Appears in bottom bar
 });
 }
--- a/gulliver/js/widgets/js-calendar/lang/ru.js
+++ b/gulliver/js/widgets/js-calendar/lang/ru.js
@@ -10,6 +10,7 @@ if (typeof Calendar!='undefined' ) {
        mn : [ "январь","февраль","март","апрель","май","июнь","июль","август","сентябрь","октябрь","ноябрь","декабрь" ],
        smn : [ "янв","фев","мар","апр","май","июн","июл","авг","сен","окт","ноя","дек" ],
        dn : [ "воскресенье","понедельник","вторник","среда","четверг","пятница","суббота","воскресенье" ],
-        sdn : [ "вск", "пон", "втр", "срд", "чет", "пят", "суб", "вск" ]
+        sdn : [ "вск", "пон", "втр", "срд", "чет", "пят", "суб", "вск" ],
+        done: "сделанный" //Appears in bottom bar
 });
 }
--- a/gulliver/js/widgets/js-calendar/lang/sv.js
+++ b/gulliver/js/widgets/js-calendar/lang/sv.js
@@ -10,6 +10,7 @@ if (typeof Calendar!='undefined' ) {
        mn : [ "januari","februari","mars","april","maj","juni","juli","augusti","september","oktober","november","december" ],
        smn : [ "jan","feb","mar","apr","maj","jun","jul","aug","sep","okt","nov","dec" ],
        dn : [ "söndag","måndag","tisdag","onsdag","torsdag","fredag","lördag","söndag" ],
-        sdn : [ "sö","må","ti","on","to","fr","lö","sö" ]
+        sdn : [ "sö","må","ti","on","to","fr","lö","sö" ],
+        done: "Klar" //Appears in bottom bar
 });
 }