dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #32160
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16433: gis multiple calendars support for date picker
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16433 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-08-18 10:56:50 +0200
message:
gis multiple calendars support for date picker
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.plugin.min.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/jquery.calendars.picker.dhis2.css
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/index.html
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.plugin.min.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.plugin.min.js 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.plugin.min.js 2014-08-14 16:20:15 +0000
@@ -0,0 +1,4 @@
+/** Abstract base class for collection plugins v1.0.1.
+ Written by Keith Wood (kbwood{at}iinet.com.au) December 2013.
+ Licensed under the MIT (https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) license. */
+(function(){var j=false;window.JQClass=function(){};JQClass.classes={};JQClass.extend=function extender(f){var g=this.prototype;j=true;var h=new this();j=false;for(var i in f){h[i]=typeof f[i]=='function'&&typeof g[i]=='function'?(function(d,e){return function(){var b=this._super;this._super=function(a){return g[d].apply(this,a||[])};var c=e.apply(this,arguments);this._super=b;return c}})(i,f[i]):f[i]}function JQClass(){if(!j&&this._init){this._init.apply(this,arguments)}}JQClass.prototype=h;JQClass.prototype.constructor=JQClass;JQClass.extend=extender;return JQClass}})();(function($){JQClass.classes.JQPlugin=JQClass.extend({name:'plugin',defaultOptions:{},regionalOptions:{},_getters:[],_getMarker:function(){return'is-'+this.name},_init:function(){$.extend(this.defaultOptions,(this.regionalOptions&&this.regionalOptions[''])||{});var c=camelCase(this.name);$[c]=this;$.fn[c]=function(a){var b=Array.prototype.slice.call(arguments,1);if($[c]._isNotChained(a,b)){return $[c][a].apply($[c],[this[0]].concat(b))}return this.each(function(){if(typeof a==='string'){if(a[0]==='_'||!$[c][a]){throw'Unknown method: '+a;}$[c][a].apply($[c],[this].concat(b))}else{$[c]._attach(this,a)}})}},setDefaults:function(a){$.extend(this.defaultOptions,a||{})},_isNotChained:function(a,b){if(a==='option'&&(b.length===0||(b.length===1&&typeof b[0]==='string'))){return true}return $.inArray(a,this._getters)>-1},_attach:function(a,b){a=$(a);if(a.hasClass(this._getMarker())){return}a.addClass(this._getMarker());b=$.extend({},this.defaultOptions,this._getMetadata(a),b||{});var c=$.extend({name:this.name,elem:a,options:b},this._instSettings(a,b));a.data(this.name,c);this._postAttach(a,c);this.option(a,b)},_instSettings:function(a,b){return{}},_postAttach:function(a,b){},_getMetadata:function(d){try{var f=d.data(this.name.toLowerCase())||'';f=f.replace(/'/g,'"');f=f.replace(/([a-zA-Z0-9]+):/g,function(a,b,i){var c=f.substring(0,i).match(/"/g);return(!c||c.length%2===0?'"'+b+'":':b+':')});f=$.parseJSON('{'+f+'}');for(var g in f){var h=f[g];if(typeof h==='string'&&h.match(/^new Date\((.*)\)$/)){f[g]=eval(h)}}return f}catch(e){return{}}},_getInst:function(a){return $(a).data(this.name)||{}},option:function(a,b,c){a=$(a);var d=a.data(this.name);if(!b||(typeof b==='string'&&c==null)){var e=(d||{}).options;return(e&&b?e[b]:e)}if(!a.hasClass(this._getMarker())){return}var e=b||{};if(typeof b==='string'){e={};e[b]=c}this._optionsChanged(a,d,e);$.extend(d.options,e)},_optionsChanged:function(a,b,c){},destroy:function(a){a=$(a);if(!a.hasClass(this._getMarker())){return}this._preDestroy(a,this._getInst(a));a.removeData(this.name).removeClass(this._getMarker())},_preDestroy:function(a,b){}});function camelCase(c){return c.replace(/-([a-z])/g,function(a,b){return b.toUpperCase()})}$.JQPlugin={createPlugin:function(a,b){if(typeof a==='object'){b=a;a='JQPlugin'}a=camelCase(a);var c=camelCase(b.name);JQClass.classes[c]=JQClass.classes[a].extend(b);new JQClass.classes[c]()}}})(jQuery);
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/index.html'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/index.html 2014-08-13 15:40:54 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/index.html 2014-08-15 10:50:41 +0000
@@ -5,6 +5,8 @@
<title>DHIS2 GIS</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<link rel="stylesheet" type="text/css" href="../../dhis-web-commons/javascripts/ext/resources/css/ext-all-gray.css"/>
+ <link rel="stylesheet" type="text/css" href="../../dhis-web-commons/javascripts/jQuery/calendars/css/jquery.calendars.picker.css"/>
+ <link rel="stylesheet" type="text/css" href="jquery.calendars.picker.dhis2.css"/>
<link rel="stylesheet" type="text/css" href="styles/style.css" />
</head>
@@ -27,14 +29,13 @@
<script type="text/javascript" src="scripts/custom.js"></script>
<script src="../../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
+ <script src="../../dhis-web-commons/javascripts/jQuery/jquery.plugin.min.js"></script>
<script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.min.js"></script>
<script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.plus.min.js"></script>
<script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.picker.min.js"></script>
<script src="../../dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script>
<script src="../../dhis-web-commons/javascripts/date.js"></script>
- <script type="text/javascript" src="../../dhis-web-commons/javascripts/periodTypeNoDep.js"></script>
-
<script type="text/javascript" src="scripts/core.js"></script>
<script type="text/javascript" src="scripts/mapfish/MapFish.js"></script>
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/jquery.calendars.picker.dhis2.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/jquery.calendars.picker.dhis2.css 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/jquery.calendars.picker.dhis2.css 2014-08-15 10:50:41 +0000
@@ -0,0 +1,8 @@
+.calendars-popup {
+ z-index: 100000;
+ margin-top: 2px;
+}
+
+.calendars-nav a {
+ padding: 2px;
+}
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-08-13 15:53:39 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-08-15 10:50:41 +0000
@@ -4524,29 +4524,54 @@
});
// date
- startDate = Ext.create('Ext.form.field.Date', {
+
+ onDateFieldRender = function(c) {
+ $('#' + c.inputEl.id).calendarsPicker({
+ calendar: gis.init.calendar,
+ dateFormat: gis.init.dateFormat
+ });
+ };
+
+ startDate = Ext.create('Ext.form.field.Text', {
fieldLabel: 'Start date',
labelAlign: 'top',
labelCls: 'gis-form-item-label-top',
- //labelStyle: 'font-weight: bold',
labelSeparator: '',
- columnWidth: 0.5,
- //style: 'margin-right: 1px',
- format: 'Y-m-d',
- value: new Date( (new Date()).setMonth( (new Date()).getMonth() - 3))
- });
+ columnWidth: 0.5,
+ height: 41,
+ listeners: {
+ render: function(c) {
+ onDateFieldRender(c);
+ }
+ }
+ });
- endDate = Ext.create('Ext.form.field.Date', {
+ endDate = Ext.create('Ext.form.field.Text', {
fieldLabel: 'End date',
labelAlign: 'top',
labelCls: 'gis-form-item-label-top',
- //labelStyle: 'font-weight: bold',
labelSeparator: '',
- columnWidth: 0.5,
- style: 'margin-left: 1px',
- format: 'Y-m-d',
- value: new Date()
- });
+ columnWidth: 0.5,
+ height: 41,
+ style: 'margin-left: 1px',
+ listeners: {
+ render: function(c) {
+ onDateFieldRender(c);
+ }
+ }
+ });
+
+ //endDate = Ext.create('Ext.form.field.Date', {
+ //fieldLabel: 'End date',
+ //labelAlign: 'top',
+ //labelCls: 'gis-form-item-label-top',
+ ////labelStyle: 'font-weight: bold',
+ //labelSeparator: '',
+ //columnWidth: 0.5,
+ //style: 'margin-left: 1px',
+ //format: 'Y-m-d',
+ //value: new Date()
+ //});
period = Ext.create('Ext.panel.Panel', {
title: '<div class="gis-panel-title-period">Periods</div>',
@@ -5155,8 +5180,10 @@
view.program = program.getRecord();
view.stage = stage.getRecord();
- view.startDate = startDate.getSubmitValue();
- view.endDate = endDate.getSubmitValue();
+ //view.startDate = startDate.getSubmitValue();
+ //view.endDate = endDate.getSubmitValue();
+ view.startDate = startDate.getValue();
+ view.endDate = endDate.getValue();
view.dataElements = [];
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css 2014-07-03 12:41:11 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css 2014-08-14 16:20:15 +0000
@@ -44,6 +44,10 @@
* General
*--------------------------------------------------------------------------*/
+.calendars-popup {
+ z-index: 999999 !important;
+}
+
html * {
font-family: arial, sans-serif, liberation sans, consolas !important;
}
