From abf16afd9d620c143c84ab91ba2e3c2e68fc4703 Mon Sep 17 00:00:00 2001
From: jloboescalona2 <47326048+jloboescalona2@users.noreply.github.com>
Date: Wed, 27 Feb 2019 11:30:40 +0100
Subject: [PATCH] Bug 2961 (#2990)

* B #2961 add timepicker in relative scheduled actions

* B # 2961 add datepicker in scheduled actions
---
 .../oneflow-templates-tab/dialogs/clone.js    |  1 -
 .../public/app/tabs/vnets-tab/actions.js      | 52 +++++++++----------
 .../app/tabs/vnets-tab/form-panels/create.js  |  7 ++-
 .../public/app/utils/schedule_action.js       | 29 +++++++----
 .../public/app/utils/schedule_action/html.hbs |  4 +-
 src/sunstone/views/index.erb                  |  3 +-
 6 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone.js
index 615abc1aa2..a023ea0d93 100644
--- a/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone.js
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone.js
@@ -84,7 +84,6 @@ define(function(require) {
       Sunstone.getDialog(DIALOG_ID).hide();
       Sunstone.getDialog(DIALOG_ID).reset();
       setTimeout(function() {
-        console.log("e");
         Sunstone.runAction("ServiceTemplate.refresh");
       }, 1500);
       return false;
diff --git a/src/sunstone/public/app/tabs/vnets-tab/actions.js b/src/sunstone/public/app/tabs/vnets-tab/actions.js
index 81b37b5f94..65404452dc 100644
--- a/src/sunstone/public/app/tabs/vnets-tab/actions.js
+++ b/src/sunstone/public/app/tabs/vnets-tab/actions.js
@@ -15,26 +15,26 @@
 /* -------------------------------------------------------------------------- */
 
 define(function(require) {
-  var Sunstone = require('sunstone');
-  var Notifier = require('utils/notifier');
-  var Locale = require('utils/locale');
-  var DataTable = require('./datatable');
-  var OpenNebulaResource = require('opennebula/network');
-  var OpenNebulaCluster = require('opennebula/cluster');
-  var OpenNebulaAction = require('opennebula/action');
-  var CommonActions = require('utils/common-actions');
+  var Sunstone = require("sunstone");
+  var Notifier = require("utils/notifier");
+  var Locale = require("utils/locale");
+  var DataTable = require("./datatable");
+  var OpenNebulaResource = require("opennebula/network");
+  var OpenNebulaCluster = require("opennebula/cluster");
+  var OpenNebulaAction = require("opennebula/action");
+  var CommonActions = require("utils/common-actions");
 
   var RESOURCE = "Network";
   var XML_ROOT = "VNET";
-  var TAB_ID = require('./tabId');
+  var TAB_ID = require("./tabId");
 
-  var INSTANTIATE_DIALOG_ID = require('./form-panels/instantiate/formPanelId');
-  var CREATE_DIALOG_ID = require('./form-panels/create/formPanelId');
-  var ADD_AR_DIALOG_ID = require('./dialogs/add-ar/dialogId');
-  var UPDATE_AR_DIALOG_ID = require('./dialogs/update-ar/dialogId');
-  var RESERVE_DIALOG_ID = require('./dialogs/reserve/dialogId');
-  var IMPORT_DIALOG_ID = require('./form-panels/import/formPanelId');
-  var CLUSTERS_DIALOG_ID = require('utils/dialogs/clusters/dialogId');
+  var INSTANTIATE_DIALOG_ID = require("./form-panels/instantiate/formPanelId");
+  var CREATE_DIALOG_ID = require("./form-panels/create/formPanelId");
+  var ADD_AR_DIALOG_ID = require("./dialogs/add-ar/dialogId");
+  var UPDATE_AR_DIALOG_ID = require("./dialogs/update-ar/dialogId");
+  var RESERVE_DIALOG_ID = require("./dialogs/reserve/dialogId");
+  var IMPORT_DIALOG_ID = require("./form-panels/import/formPanelId");
+  var CLUSTERS_DIALOG_ID = require("utils/dialogs/clusters/dialogId");
 
   var _commonActions = new CommonActions(OpenNebulaResource, RESOURCE, TAB_ID,
     XML_ROOT, Locale.tr("Virtual Network created"));
@@ -46,21 +46,21 @@ define(function(require) {
     "Network.show" : _commonActions.show(),
     "Network.refresh" : _commonActions.refresh(),
     "Network.delete" : _commonActions.del(),
-    "Network.hold": _commonActions.singleAction('hold'),
-    "Network.release": _commonActions.singleAction('release'),
-    "Network.chown": _commonActions.multipleAction('chown'),
-    "Network.chgrp": _commonActions.multipleAction('chgrp'),
-    "Network.chmod": _commonActions.singleAction('chmod'),
-    "Network.rename": _commonActions.singleAction('rename'),
+    "Network.hold": _commonActions.singleAction("hold"),
+    "Network.release": _commonActions.singleAction("release"),
+    "Network.chown": _commonActions.multipleAction("chown"),
+    "Network.chgrp": _commonActions.multipleAction("chgrp"),
+    "Network.chmod": _commonActions.singleAction("chmod"),
+    "Network.rename": _commonActions.singleAction("rename"),
     "Network.update" : _commonActions.update(),
     "Network.update_template" : _commonActions.updateTemplate(),
     "Network.append_template" : _commonActions.appendTemplate(),
     "Network.update_dialog" : _commonActions.checkAndShowUpdate(),
     "Network.show_to_update" : _commonActions.showUpdate(CREATE_DIALOG_ID),
-    "Network.lockM": _commonActions.multipleAction('lock', false),
-    "Network.lockU": _commonActions.multipleAction('lock', false),
-    "Network.lockA": _commonActions.multipleAction('lock', false),
-    "Network.unlock": _commonActions.multipleAction('unlock', false),
+    "Network.lockM": _commonActions.multipleAction("lock", false),
+    "Network.lockU": _commonActions.multipleAction("lock", false),
+    "Network.lockA": _commonActions.multipleAction("lock", false),
+    "Network.unlock": _commonActions.multipleAction("unlock", false),
 
     "Network.import_dialog" : {
       type: "custom",
diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js
index 26c494b793..593c475840 100644
--- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js
@@ -357,7 +357,7 @@ define(function(require) {
       network_json["SECURITY_GROUPS"] = secgroups.join(",");
     }
 
-    var cluster_id = $(".resource_list_select", $('#vnet_cluster_id', context)).val();
+    var cluster_id = $(".resource_list_select", $("#vnet_cluster_id", context)).val();
 
     $.extend(network_json, CustomTagsTable.retrieve($("#vnetCreateContextTab", context)));
 
@@ -378,7 +378,6 @@ define(function(require) {
         "vnet" : network_json,
         "cluster_id": cluster_id
       };
-
       Sunstone.runAction("Network.create", network_json);
       return false;
     } else if (this.action == "update") {
@@ -417,8 +416,8 @@ define(function(require) {
       if (!cluster_id) cluster_id = "0";
 
       ResourceSelect.insert({
-        context: $('#vnet_cluster_id', context),
-        resourceName: 'Cluster',
+        context: $("#vnet_cluster_id", context),
+        resourceName: "Cluster",
         initValue: cluster_id
       });
     } else {
diff --git a/src/sunstone/public/app/utils/schedule_action.js b/src/sunstone/public/app/utils/schedule_action.js
index 67c27c39d0..23b0ec0b72 100644
--- a/src/sunstone/public/app/utils/schedule_action.js
+++ b/src/sunstone/public/app/utils/schedule_action.js
@@ -38,7 +38,13 @@ define(function (require) {
       var value = e.val().replace(/\s/g, "");
       e.val(value);
     };
-    var options_date_picker = {
+
+    var options_date_picker={
+      dateFormat: "yy-mm-dd",
+      minDate: new Date(),
+      showOptions: { direction: "down" }
+    };
+    var options_hour_picker = {
       title: Locale.tr("Hour"),
       twentyFour: "true",
       timeSeparator: ":",
@@ -56,7 +62,15 @@ define(function (require) {
       "actions": options,
       "res": that.res
     }));
-    schedule.find("#time_input",context).on("click",function(e){e.stopPropagation();}).wickedpicker(options_date_picker);
+
+    //input periodic scheduled date
+    schedule.find("#end_value_date",context).on("click",function(e){e.stopPropagation();$(".wickedpicker").hide();}).on("keypress",function(e){e.preventDefault(); return false;}).datepicker(options_date_picker);
+
+    //input date scheduled
+    schedule.find("#date_input",context).on("click",function(e){e.stopPropagation();$(".wickedpicker").hide();}).on("keypress",function(e){e.preventDefault(); return false;}).datepicker(options_date_picker);
+
+    schedule.find("#time_input",context).on("click",function(e){e.stopPropagation();}).wickedpicker(options_hour_picker);
+
     schedule.find("#relative_time", context).on("click", function (e) {
       $("#schedule_type", context).prop("checked", false);
       if ($(this).is(":checked")) {
@@ -85,10 +99,7 @@ define(function (require) {
     if (mm < 10) {
       mm = "0" + mm;
     }
-    today = yyyy + "-" + mm + "-" + dd;
-    $("#date_input", context).attr("min", today);
-    $("#date_input", context).attr("value", today);
-
+    $("#date_input", context).attr("value", yyyy + "-" + mm + "-" + dd);
     $(".periodic", context).hide();
 
     $("input#schedule_type", context).on("change", function () {
@@ -162,10 +173,10 @@ define(function (require) {
           if (mm < 10) {
             mm = "0" + mm;
           }
-          min = yyyy + "-" + mm + "-" + dd;
+          min = yyyy + "-" + mm + "-" + dd ;
           break;
       }
-      $("#end_value_" + value, context).attr("min", min);
+      $("#end_value_" + value, context).attr("value", min);
       $("#end_value_" + value, context).prop("disabled", false);
     });
 
@@ -292,7 +303,7 @@ define(function (require) {
             Notifier.notifyError("End date not defined.");
             return false;
           }
-          var time_value = end_date + " " + time_input_value;
+          var time_value = end_date + " 12:00";
           var epoch_str = new Date(time_value);
           end_value = parseInt(epoch_str.getTime()) / 1000;
         }
diff --git a/src/sunstone/public/app/utils/schedule_action/html.hbs b/src/sunstone/public/app/utils/schedule_action/html.hbs
index 468983de01..979c515714 100644
--- a/src/sunstone/public/app/utils/schedule_action/html.hbs
+++ b/src/sunstone/public/app/utils/schedule_action/html.hbs
@@ -41,7 +41,7 @@ the License for the specific language governing permissions and }} {{! limitatio
 <tr id="no_relative_time_form">
   <td></td>
   <td>
-		<input style="width: 80%" id="date_input" type="date" />
+		<input style="width: 80%" id="date_input" type="text" />
 	</td>
 	<td>
 		<input style="width: 80%" class="timepicker" id="time_input" type="text" />
@@ -100,7 +100,7 @@ the License for the specific language governing permissions and }} {{! limitatio
 		<label for="end_type_date">{{tr "On"}}</label>
 	</td>
 	<td id="td_end_value_date">
-		<input class="end_input" id="end_value_date" type="date" disabled/>
+		<input class="end_input" id="end_value_date" type="text" disabled/>
 	</td>
 </tr>
 <tr class="periodic create">
diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb
index f02bae908c..26287062d5 100644
--- a/src/sunstone/views/index.erb
+++ b/src/sunstone/views/index.erb
@@ -65,7 +65,8 @@
     </script>
 
 
-
+    <link href="bower_components/wickedpicker/dist/wickedpicker.min.css" media="screen, projector, print" rel="stylesheet" type="text/css"></link>
+    <link href="bower_components/jquery-ui/themes/flick/jquery-ui.min.css" media="screen, projector, print" rel="stylesheet" type="text/css"></link>
     <% if $conf[:env] == 'dev' %>
     <link href="bower_components/wickedpicker/dist/wickedpicker.min.css" media="screen, projector, print" rel="stylesheet" type="text/css"></link>
     <link href="css/app.css?v=<%= OpenNebula::VERSION %>" media="screen, projector, print" rel="stylesheet" type="text/css"></link>