Added About Us page (#122)

openMF · Oct 2, 2018 · d34b820 · d34b820
1 parent 86c0e6d
commit d34b820
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 5 deletions.
diff --git a/app/app.routes.js b/app/app.routes.js
@@ -85,8 +85,8 @@
                 })
                 .state('app.aboutus', {
                     url: '/about',
-                    templateUrl: 'src/common/coming-soon.html',
-                    controller: 'ClientCtrl',
+                    templateUrl: 'src/aboutUs/aboutUs.html',
+                    controller: 'AboutUsCtrl',
                     controllerAs: 'vm',
                     data: {
                         title: 'About Us',

diff --git a/app/assets/stylesheets/_custom.scss b/app/assets/stylesheets/_custom.scss
@@ -221,6 +221,23 @@ md-toolbar .md-menu {
   margin-top: 5vh;
 }
 
+.org-logo-height{
+  height: 300px;
+}
+
+.org-name{
+  padding-top: 80px;
+  padding-left: 10px;
+}
+
+.org-descripion{
+  padding-top: 20px;
+}
+.org-description-contents{
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
 @media (min-width: 960px) {
   .login-container{
     box-shadow: 1px 1px 80px black;

diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json
@@ -73,6 +73,7 @@
   "label.heading.transactionhistoryGraph": "Graph for transaction history",
   "label.heading.category": "Category",
   "label.headping.reports": "Reports",
+  "label.heading.aboutUs": "About Us",
 
   "label.msg.loadingCharges": "Loading Charges",
   "label.msg.loadingRecentTransactions": "Loading Recent Transactions",

diff --git a/app/src/aboutUs/aboutUs.component.js b/app/src/aboutUs/aboutUs.component.js
@@ -0,0 +1,19 @@
+(function () {
+    'use strict';
+
+    angular.module('selfService')
+        .controller('AboutUsCtrl', ['$scope', '$rootScope', '$state', '$stateParams', 'AboutUsService', AboutUsCtrl]);
+
+    function AboutUsCtrl ($scope, $rootScope, $state, $stateParams, AboutUsService) {
+
+        var vm=this;
+        vm.org = null; // it is an array, when data is available then vm.org = {JSON data};
+        vm.getDetails = getDetails;
+
+        function getDetails() {
+            AboutUsService.getOrgDetails.get().$promise.then(function (data){
+                vm.org =data;
+            })
+        }
+    }
+})();
diff --git a/app/src/aboutUs/aboutUs.html b/app/src/aboutUs/aboutUs.html
@@ -0,0 +1,39 @@
+<div>
+    <md-content>
+        <div ng-if="!vm.org">
+            <md-card>
+                <md-card-title>
+                    <md-card-title-text>
+                        <span class="md-title">No details to show</span>
+                    </md-card-title-text>
+                </md-card-title>
+            </md-card>
+        </div>
+        <div layout="column" ng-if="vm.org">
+            <div layout="row" layout-xs="column">
+                <div flex="40">
+                    <md-card>
+                        <md-whiteframe class="md-whiteframe-7dp" layout layout-align="center center">
+                            <img ng-src="vm.org.logo" class="md-media-sm org-logo-height">
+                        </md-whiteframe>
+                    </md-card>
+                </div>
+                <div class="org-name" flex>
+                    <md-card>
+                        <md-whiteframe class="md-whiteframe-7dp" layout layout-align="center center" flex>
+                            <h2>{{vm.org.name}}</h2>
+                        </md-whiteframe>
+                    </md-card>
+                </div>
+            </div>
+            <div class="org-descripion" flex>
+                <md-card>
+                    <md-whiteframe class="md-whiteframe-7dp" layout="column" layout-align="center center">
+                        <h2>{{'label.heading.aboutUs' | translate}}</h2>
+                        <p class="org-description-contents">{{vm.org.description}}</p>
+                    </md-whiteframe>
+                </md-card>
+            </div>
+        </div>
+    </md-content>
+</div>
diff --git a/app/src/aboutUs/aboutUs.service.js b/app/src/aboutUs/aboutUs.service.js
@@ -0,0 +1,13 @@
+(function (){
+    'use strict';
+
+    angular.module('selfService')
+        .service('AboutUsService', ['$q', '$http', '$rootScope', '$state', '$resource', AboutUsService]);
+
+    function AboutUsService($q,$http,$rootScope,$state,$resource){
+
+        this.getOrgDetails = function () {
+            return $resource(''); // enter the URL of the organisations details.
+        };
+    }
+})();
diff --git a/app/src/common/main.html b/app/src/common/main.html
@@ -63,7 +63,7 @@ <h1 class="sidenav-title md-title">{{'nav.msg.welcome' | translate}} {{vm.profil
         </md-button>
         <md-divider></md-divider>
         <md-button ng-click="vm.selectItem('Reports')" ui-sref-active="md-warn" ui-sref=".reports"
-                   style="text-align: left;display: block;">
+                   class="sidenav-icon">
             <div class="md-tile-content">
                 <i hide-sm hide-md class="material-icons md-18">ballot</i> {{ 'nav.label.reports' | translate }}
             </div>

diff --git a/app/src/reports/run_reports/run_reports.component.js b/app/src/reports/run_reports/run_reports.component.js
@@ -19,7 +19,6 @@
         RunReportService.reports().get({reportName: vm.reportName, id: vm.id}).$promise.then(function(data) {
             vm.reportData = data;
             vm.reportData.columnHeaders = data.columnHeaders;
-            console.log(vm.reportData.data[0].row);
         });
 
         function isDecimal (index) {
@@ -31,7 +30,7 @@
                 }
             }
             return false;
-        };
+        }
 
     }