From 978dbcf0a196acbafad72fe1e2478ec0e384f02f Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Wed, 23 Aug 2017 18:27:19 -0400 Subject: Deliver centralized role management feature Repair multiple defects also. Revise deployment to use docker-compose. Remove all zip archives. Issue: PORTAL-21, PORTAL-25, PORTAL-28, PORTAL-52, PORTAL-69, PORTAL-74, PORTAL-76, PORTAL-80, PORTAL-82 Change-Id: Ie72fec7d35ba78beb162bba6ed27b2caee340c61 Signed-off-by: Christopher Lott (cl778h) --- .../common-widgets/events-widget/js/controller.js | 64 +++++++++++++++++++++ .../events-widget/markup/markup.html | 49 ++++++++++++++++ .../events-widget/styles/app-widget-1-by-3.css | 43 ++++++++++++++ .../events-widget/styles/images/generic.png | Bin 0 -> 208 bytes .../events-widget/styles/images/grips.png | Bin 0 -> 951 bytes .../common-widgets/events-widget/styles/styles.css | 43 ++++++++++++++ 6 files changed, 199 insertions(+) create mode 100644 ecomp-portal-widget-ms/common-widgets/events-widget/js/controller.js create mode 100644 ecomp-portal-widget-ms/common-widgets/events-widget/markup/markup.html create mode 100644 ecomp-portal-widget-ms/common-widgets/events-widget/styles/app-widget-1-by-3.css create mode 100644 ecomp-portal-widget-ms/common-widgets/events-widget/styles/images/generic.png create mode 100644 ecomp-portal-widget-ms/common-widgets/events-widget/styles/images/grips.png create mode 100644 ecomp-portal-widget-ms/common-widgets/events-widget/styles/styles.css (limited to 'ecomp-portal-widget-ms/common-widgets/events-widget') diff --git a/ecomp-portal-widget-ms/common-widgets/events-widget/js/controller.js b/ecomp-portal-widget-ms/common-widgets/events-widget/js/controller.js new file mode 100644 index 00000000..8ccebeee --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/events-widget/js/controller.js @@ -0,0 +1,64 @@ +function EventsCtrl($rootScope, applicationsService , $log, + $window, userProfileService, $scope, $cookies, $timeout, $interval, + $uibModal, dashboardService, ngDialog) { + var _this = this; + + //activate spinner + this.isLoading = true; + $scope.getUserAppsIsDone = false; + this.userProfileService = userProfileService; + $scope.demoNum = 1; + $scope.event_content_show = false; + $scope.widgetData = []; + + $scope.editWidgetModalPopup = function(availableData, resourceType) { + + $scope.editData = JSON.stringify(availableData); + $scope.availableDataTemp = $scope.availableData; + ngDialog.open({ + templateUrl : 'app/views/dashboard/dashboard-widget-manage.html', + controller : 'CommonWidgetController', + resolve : { + message : function message() { + var message = { + type : resourceType, + availableData : $scope.editData + }; + return message; + } + } + }).closePromise.then(needUpdate => { + if(resourceType=='NEWS'){ + $scope.updateNews(); + }else if(resourceType=='EVENTS'){ + $scope.updateEvents(); + }else if(resourceType=='IMPORTANTRESOURCES'){ + $scope.updateImportRes(); + } + }); + }; + /*Setting News data*/ + $scope.eventData = []; + $scope.updateEvents = function() { + + $scope.eventData.length=0; + //dashboardService.getCommonWidgetData('EVENTS').then(function(res) { + var eventDataJsonArray = res.response.items; + for (var i = 0; i < eventDataJsonArray.length; i++) { + if(eventDataJsonArray[i].eventDate !=null) { + // yyyy-mm-dd + eventDataJsonArray[i].year = eventDataJsonArray[i].eventDate.substring(2,4); + eventDataJsonArray[i].mon = eventDataJsonArray[i].eventDate.substring(5,7); + eventDataJsonArray[i].day = eventDataJsonArray[i].eventDate.substring(8,10); + } + $scope.eventData.push(eventDataJsonArray[i]); + } + //})['catch'](function(err) { + // $log.error('dashboard controller: failed to get Events list', err); + // _this.isLoading = false; + //}); + } + $scope.updateEvents(); + + + } diff --git a/ecomp-portal-widget-ms/common-widgets/events-widget/markup/markup.html b/ecomp-portal-widget-ms/common-widgets/events-widget/markup/markup.html new file mode 100644 index 00000000..39715547 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/events-widget/markup/markup.html @@ -0,0 +1,49 @@ +
+
+
+
    +
  • +
    +
    {{event.mon}}/{{event.day}}/{{event.year}} +
    +
    +
    +

    +
    +
    + + +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    • + + +
+
+
+
+
+
There's currently no + event available.
+
+
+
+
+
+
diff --git a/ecomp-portal-widget-ms/common-widgets/events-widget/styles/app-widget-1-by-3.css b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/app-widget-1-by-3.css new file mode 100644 index 00000000..53ac5c82 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/app-widget-1-by-3.css @@ -0,0 +1,43 @@ + +.portal-widget-panel-container { + margin-left:150px; + width:1500px; +} + + +.portal-widget-panel-fixed-panel { + min-height: 300px; + max-height: 300px; + overflow: auto; +} + +.portal-widget-panel-double-middle { + min-height: 660px; + max-height: 660px; + overflow: auto; +} + +.portal-widget-panel-row { + margin-right: 0px; + margin-left: 0px; + width: 2800px; +} + +/*Increases the width of the card/panel */ +.portal-widget-panel-panel-default { + width:450px +} + +/*Controls the spacing between the cards */ +.portal-widget-panel-col-sm-3 { + width:20.5% +} + +.portal-widget-panel-top { + top: 15px; + left: 15px; +} + +#stork-css-ready { +color: #bada55 !important; +} \ No newline at end of file diff --git a/ecomp-portal-widget-ms/common-widgets/events-widget/styles/images/generic.png b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/images/generic.png new file mode 100644 index 00000000..5f06bc2e Binary files /dev/null and b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/images/generic.png differ diff --git a/ecomp-portal-widget-ms/common-widgets/events-widget/styles/images/grips.png b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/images/grips.png new file mode 100644 index 00000000..29b92cc5 Binary files /dev/null and b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/images/grips.png differ diff --git a/ecomp-portal-widget-ms/common-widgets/events-widget/styles/styles.css b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/styles.css new file mode 100644 index 00000000..b2fbe871 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/styles.css @@ -0,0 +1,43 @@ + +.portal-widget-panel-container { + margin-left:150px; + width:1500px; +} + + +.portal-widget-panel-fixed-panel { + min-height: 300px; + max-height: 1300px; + overflow: auto; +} + +.portal-widget-panel-double-middle { + min-height: 660px; + max-height: 660px; + overflow: auto; +} + +.portal-widget-panel-row { + margin-right: 0px; + margin-left: 0px; + width: 2800px; +} + +/*Increases the width of the card/panel */ +.portal-widget-panel-panel-default { + width:450px +} + +/*Controls the spacing between the cards */ +.portal-widget-panel-col-sm-3 { + width:20.5% +} + +.portal-widget-panel-top { + top: 15px; + left: 15px; +} + +#events-css-ready { +color: #bada55 !important; +} \ No newline at end of file -- cgit 1.2.3-korg