Merge branch 'fix/16919_fix_datetime_metadata_input_to_develop' into 'develop'

Fix/16919 fix datetime metadata input to develop

See merge request !667

dependency/html/Document.php

@@ -283,8 +283,8 @@ class Document extends \dependency\xml\Document
         // $this->addScript("/public/js/moment_2.14.1/moment.js");
         $this->addScript("/public/js/moment_2.14.1/moment.min.js");
 
-        // $this->addScript("/public/js/dateTimePicker/bootstrap-datetimepicker.js");
-        $this->addScript("/public/js/dateTimePicker/bootstrap-datetimepicker.min.js");
+        $this->addScript("/public/js/dateTimePicker/bootstrap-datetimepicker.js");
+        // $this->addScript("/public/js/dateTimePicker/bootstrap-datetimepicker.min.js");
 
         $this->addScript("/public/js/csrf/csrfprotector.js");//min version does not exists
 
@@ -346,7 +346,7 @@ class Document extends \dependency\xml\Document
     public function addContent($content, $container = false)
     {
         $contentFragment = $this->addFragment($content);
-        
+
         if (!$container) {
             $container = $this->getContainer();
         }

src/presentation/maarchRM/Resources/view/dashboard/mainScreen/descriptionForm.html

@@ -370,7 +370,6 @@ input:invalid {
             field.attr('placeholder', $('#date_text').text());
 
             parent.append(field);
-
             if (descriptionField.format == 'datetime') {
                 field.data('format', 'datetime');
                 field.datetimepicker(dateTimePickerParams);
@@ -934,6 +933,7 @@ input:invalid {
                     data = data.replace('T', ' ');
                     field.data('DateTimePicker').format('YYYY-MM-DD HH:mm:ss');
                     field.data('DateTimePicker').date(data)
+                    field.data('DateTimePicker').format('YYYY-MM-DD HH:mm:ss');
                 } else {
                     data = new Date(data).toLocaleDateString("[?merge locale ?]").replace(/\//g, "-");
                     field.datepicker('setDate', data);

src/presentation/maarchRM/Resources/view/dashboard/mainScreen/folder.html

@@ -452,7 +452,6 @@
 
     NewArchive = {
         loadImportForm: function(e, profileMetadata) {
-            console.trace();
             $('#folderContents').addClass('hide');
             trigger('newArchiveForm.recordsManagement', [profileMetadata, ArchiveFolderList.orgRegNumber, ArchiveFolderList.folderId, e.data('parent-archive-id'), e.data('parent-archive-name')]);
         }

web/public/js/dateTimePicker/bootstrap-datetimepicker.js

@@ -328,7 +328,7 @@
 
             getTemplate = function () {
                 var template = $('<div>').addClass('bootstrap-datetimepicker-widget dropdown-menu'),
-                    dateView = $('<div>').addClass('datepicker').append(getDatePickerTemplate()),
+                    dateView = $('<div>').addClass('datepicker2').append(getDatePickerTemplate()),
                     timeView = $('<div>').addClass('timepicker').append(getTimePickerTemplate()),
                     content = $('<ul>').addClass('list-unstyled'),
                     toolbar = $('<li>').addClass('picker-switch' + (options.collapse ? ' accordion-toggle' : '')).append(getToolbar());
@@ -497,7 +497,7 @@
                 if (dir) {
                     currentViewMode = Math.max(minViewModeNumber, Math.min(3, currentViewMode + dir));
                 }
-                widget.find('.datepicker > div').hide().filter('.datepicker-' + datePickerModes[currentViewMode].clsName).show();
+                widget.find('.datepicker2 > div').hide().filter('.datepicker-' + datePickerModes[currentViewMode].clsName).show();
             },
 
             fillDow = function () {
@@ -2523,7 +2523,7 @@
                     return;
                 }
                 var d = this.date() || this.getMoment();
-                if (widget.find('.datepicker').is(':visible')) {
+                if (widget.find('.datepicker2').is(':visible')) {
                     this.date(d.clone().subtract(7, 'd'));
                 } else {
                     this.date(d.clone().add(this.stepping(), 'm'));
@@ -2535,7 +2535,7 @@
                     return;
                 }
                 var d = this.date() || this.getMoment();
-                if (widget.find('.datepicker').is(':visible')) {
+                if (widget.find('.datepicker2').is(':visible')) {
                     this.date(d.clone().add(7, 'd'));
                 } else {
                     this.date(d.clone().subtract(this.stepping(), 'm'));
@@ -2546,7 +2546,7 @@
                     return;
                 }
                 var d = this.date() || this.getMoment();
-                if (widget.find('.datepicker').is(':visible')) {
+                if (widget.find('.datepicker2').is(':visible')) {
                     this.date(d.clone().subtract(1, 'y'));
                 } else {
                     this.date(d.clone().add(1, 'h'));
@@ -2557,7 +2557,7 @@
                     return;
                 }
                 var d = this.date() || this.getMoment();
-                if (widget.find('.datepicker').is(':visible')) {
+                if (widget.find('.datepicker2').is(':visible')) {
                     this.date(d.clone().add(1, 'y'));
                 } else {
                     this.date(d.clone().subtract(1, 'h'));
@@ -2568,7 +2568,7 @@
                     return;
                 }
                 var d = this.date() || this.getMoment();
-                if (widget.find('.datepicker').is(':visible')) {
+                if (widget.find('.datepicker2').is(':visible')) {
                     this.date(d.clone().subtract(1, 'd'));
                 }
             },
@@ -2577,7 +2577,7 @@
                     return;
                 }
                 var d = this.date() || this.getMoment();
-                if (widget.find('.datepicker').is(':visible')) {
+                if (widget.find('.datepicker2').is(':visible')) {
                     this.date(d.clone().add(1, 'd'));
                 }
             },
@@ -2586,7 +2586,7 @@
                     return;
                 }
                 var d = this.date() || this.getMoment();
-                if (widget.find('.datepicker').is(':visible')) {
+                if (widget.find('.datepicker2').is(':visible')) {
                     this.date(d.clone().subtract(1, 'M'));
                 }
             },
@@ -2595,7 +2595,7 @@
                     return;
                 }
                 var d = this.date() || this.getMoment();
-                if (widget.find('.datepicker').is(':visible')) {
+                if (widget.find('.datepicker2').is(':visible')) {
                     this.date(d.clone().add(1, 'M'));
                 }
             },