som theme changes and displaying version in the bottom of the footer

Mathias Husum Nielsen · Mathias Husum Nielsen · commit 41a0842d4ebc · 2018-09-11T10:16:51.000+02:00
diff --git a/eform-client/package.json b/eform-client/package.json
@@ -12,13 +12,14 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^6.0.3",
-    "@angular/cdk": "^6.4.6",
+    "@angular/animations": "^6.1.7",
+    "@angular/cdk": "github:angular/cdk-builds",
     "@angular/common": "^6.0.3",
     "@angular/compiler": "^6.0.3",
     "@angular/core": "^6.0.3",
     "@angular/forms": "^6.0.3",
     "@angular/http": "^6.0.3",
+    "@angular/material": "github:angular/material2-builds",
     "@angular/platform-browser": "^6.0.3",
     "@angular/platform-browser-dynamic": "^6.0.3",
     "@angular/router": "^6.0.3",
diff --git a/eform-client/src/app/app.module.ts b/eform-client/src/app/app.module.ts
@@ -5,7 +5,7 @@ import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {GalleryModule} from '@ngx-gallery/core';
 import {GallerizeModule} from '@ngx-gallery/gallerize';
 import {TranslateModule} from '@ngx-translate/core';
-import { LightboxModule } from  '@ngx-gallery/lightbox';
+import { LightboxModule } from '@ngx-gallery/lightbox';
 import {DragulaModule} from 'ng2-dragula';
 import {ToastrModule} from 'ngx-toastr';
 
diff --git a/eform-client/src/app/common/services/app-settings/app-settings.service.ts b/eform-client/src/app/common/services/app-settings/app-settings.service.ts
@@ -59,4 +59,7 @@ export class AppSettingsService extends BaseService {
   resetHeaderSettings(): Observable<OperationResult> {
     return this.get(SettingsMethods.ResetHeaderSettings);
   }
+  getOneAdminSetting(attribute: string): Observable<OperationDataResult<AdminSettingsModel>> {
+    return this.get<AdminSettingsModel>(SettingsMethods.GetAdminSettings, attribute);
+  }
 }
diff --git a/eform-client/src/app/components/footer/footer.component.html b/eform-client/src/app/components/footer/footer.component.html
@@ -11,6 +11,7 @@
     </div>
   </div>
   <div class="footer-copyright text-center p-2 copyright-section">
-    <p>© Microting A/S 2007 - 2018</p>
+    <p>© Microting A/S 2007 - 2018 </p>
+    <p>{{version}}</p>
   </div>
 </footer>
diff --git a/eform-client/src/app/components/footer/footer.component.ts b/eform-client/src/app/components/footer/footer.component.ts
@@ -1,15 +1,29 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit, AfterViewInit} from '@angular/core';
+import {AdminSettingsModel} from 'src/app/common/models/settings';
+import { AppSettingsService} from '../../common/services/app-settings';
 
 @Component({
   selector: 'app-footer',
   templateUrl: './footer.component.html',
   styleUrls: ['./footer.component.scss']
 })
-export class FooterComponent implements OnInit {
-
-  constructor() { }
-
+export class FooterComponent implements OnInit, AfterViewInit {
+  adminSettingsModel: AdminSettingsModel;
+  version: string;
+  constructor(private settingsService: AppSettingsService) {
+  }
   ngOnInit() {
+  this.getAssemblyVersion('AssemblyVersion');
+  }
+  ngAfterViewInit() {
+  }
+  getAssemblyVersion(attribute: string) {
+    this.settingsService.getOneAdminSetting(attribute).subscribe(operation => {
+      if (operation && operation.success) {
+        this.adminSettingsModel = operation.model;
+      }
+      this.version = this.adminSettingsModel.assemblyVersion;
+    });
+    return this.version;
   }
-
 }
diff --git a/eform-client/src/app/modules/account-management/account-management.module.ts b/eform-client/src/app/modules/account-management/account-management.module.ts
@@ -4,6 +4,7 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {NgSelectModule} from '@ng-select/ng-select';
 import {MDBBootstrapModule} from 'port/angular-bootstrap-md';
 import {EformSharedModule} from 'src/app/common/modules/eform-shared/eform-shared.module';
+import {MatTableModule} from '@angular/material';
 
 import {
   ChangePasswordComponent,
@@ -25,7 +26,8 @@ import {TranslateModule} from '@ngx-translate/core';
     EformSharedModule,
     TranslateModule,
     ReactiveFormsModule,
-    FormsModule
+    FormsModule,
+    MatTableModule
   ],
   declarations: [
     ChangePasswordComponent,
diff --git a/eform-client/src/app/modules/account-management/components/users/users-page/users-page.component.html b/eform-client/src/app/modules/account-management/components/users/users-page/users-page.component.html
@@ -1,9 +1,9 @@
 <eform-page-subheader [title]="'User Management' | translate">
-  <div class="p-3">
-    <button
-      class="btn btn-success" (click)="openNewUserModal()"
-      mdbTooltip="{{'Create user' | translate}}">{{'New User' | translate}}</button>
-  </div>
+<div class="p-3">
+  <button
+    class="btn btn-success" (click)="openNewUserModal()"
+    mdbTooltip="{{'Create user' | translate}}">{{'New User' | translate}}</button>
+</div>
 </eform-page-subheader>
 
 <div class="container-fluid">
@@ -22,7 +22,7 @@
     </div>
   </div>
   <div class="row p-1 table-responsive no-gutters">
-    <table class="table table-striped text-center">
+    <table class="table table-striped text-center mat-elevation-z8">
       <thead>
       <tr>
         <th scope="col">ID</th>
@@ -83,4 +83,3 @@
                        (onUserDeleted)="getUserInfoList()" #removeUserModal></app-remove-user-modal>
 <!--<app-create-eform-modal #modalNewEform></app-create-eform-modal>-->
 <!--<app-cases-column-modal #modalCasesColumns></app-cases-column-modal>-->
-
diff --git a/eform-client/src/app/modules/account-management/components/users/users-page/users-page.component.ts b/eform-client/src/app/modules/account-management/components/users/users-page/users-page.component.ts
@@ -10,6 +10,7 @@ import {AdminService} from 'src/app/common/services/users';
   templateUrl: './users-page.component.html',
 })
 export class UsersPageComponent implements OnInit {
+
   isChecked = true;
   @ViewChild('userEditModal') userEditModal;
   @ViewChild('removeUserModal') removeUserModal;
diff --git a/eform-client/src/app/modules/advanced/components/entity-search/entity-search/entity-search.component.html b/eform-client/src/app/modules/advanced/components/entity-search/entity-search/entity-search.component.html
@@ -23,7 +23,7 @@
     </div>
   </div>
   <div class="row p-1 table-responsive no-gutters">
-    <table class="table table-sm table-striped text-center">
+    <table mat-table class="table table-sm table-striped text-center mat-elevation-z8">
       <thead>
       <tr>
         <th scope="col" class="table-header-sortable"
diff --git a/eform-client/src/app/modules/advanced/components/entity-select/entity-select/entity-select.component.html b/eform-client/src/app/modules/advanced/components/entity-select/entity-select/entity-select.component.html
@@ -23,7 +23,7 @@
     </div>
   </div>
   <div class="row p-1 table-responsive no-gutters">
-    <table class="table table-sm table-striped text-center">
+    <table mat-table class="table table-sm table-striped text-center mat-elevation-z8">
       <thead>
       <tr>
         <th scope="col" class="table-header-sortable"
diff --git a/eform-client/src/app/modules/advanced/components/sites/sites/sites.component.html b/eform-client/src/app/modules/advanced/components/sites/sites/sites.component.html
@@ -5,7 +5,7 @@
 <!--Here you can choose approach as you like: container-row, or flex, or just element with required styles and markup-->
 <div class="container-fluid">
   <div class="row pt-3 table-responsive no-gutters">
-    <table class="table table-sm table-striped text-center">
+    <table mat-table class="table table-sm table-striped text-center mat-elevation-z8">
       <thead>
       <tr>
         <th scope="col">{{ 'Created at' | translate }}</th>
diff --git a/eform-client/src/app/modules/advanced/components/units/units.component.html b/eform-client/src/app/modules/advanced/components/units/units.component.html
@@ -5,7 +5,7 @@
 <!--Here you can choose approach as you like: container-row, or flex, or just element with required styles and markup-->
 <div class="container-fluid">
   <div class="row pt-3 table-responsive no-gutters">
-    <table class="table table-sm table-striped text-center">
+    <table mat-table class="table table-sm table-striped text-center mat-elevation-z8">
       <thead>
       <tr>
         <th scope="col">{{ 'Created at' | translate }}</th>
diff --git a/eform-client/src/app/modules/advanced/components/workers/workers/workers.component.html b/eform-client/src/app/modules/advanced/components/workers/workers/workers.component.html
@@ -9,7 +9,7 @@
 <!--Here you can choose approach as you like: container-row, or flex, or just element with required styles and markup-->
 <div class="container-fluid">
   <div class="row p-1 table-responsive no-gutters">
-    <table class="table table-sm table-striped text-center">
+    <table mat-table class="table table-sm table-striped text-center mat-elevation-z8">
       <thead>
       <tr>
         <th scope="col">{{ 'Created at' | translate }}</th>
diff --git a/eform-client/src/app/modules/application-settings/components/admin-settings/admin-settings.component.ts b/eform-client/src/app/modules/application-settings/components/admin-settings/admin-settings.component.ts
@@ -1,4 +1,4 @@
-import {Component, HostBinding, OnInit} from '@angular/core';
+import {Component, HostBinding, OnInit, ViewChild, AfterViewInit} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import {UUID} from 'angular2-uuid';
 import {FileItem, FileUploader} from 'ng2-file-upload';
@@ -12,28 +12,29 @@ import {AuthService} from 'src/app/common/services/auth';
   templateUrl: './admin-settings.component.html',
   styleUrls: ['./admin-settings.component.scss']
 })
-export class AdminSettingsComponent implements OnInit {
+export class AdminSettingsComponent implements OnInit, AfterViewInit {
   loginPageImageUploader: FileUploader = new FileUploader({url: '/api/images/login-page-images'});
   headerImageUploader: FileUploader = new FileUploader({url: '/api/images/eform-images'});
   headerImageLink: string;
   loginPageImageLink: string;
   spinnerStatus: boolean;
-  adminSettingsModel: AdminSettingsModel = new AdminSettingsModel;
-
+  adminSettingsModel: AdminSettingsModel = new AdminSettingsModel();
   constructor(private settingsService: AppSettingsService,
               private authService: AuthService,
               private eventBrokerService: EventBrokerService) {
   }
 
   get currentRole(): string {
     return this.authService.currentRole;
-  };
-
+  }
+  ngAfterViewInit() {
+  }
   ngOnInit() {
     if (this.currentRole === 'admin') {
       this.getAdminSettings();
       this.initializeUploaders();
     }
+
   }
 
   initializeUploaders() {
@@ -85,6 +86,7 @@ export class AdminSettingsComponent implements OnInit {
         this.spinnerStatus = false;
       }
     });
+
   }
 
   updateAdminSettings() {
diff --git a/eform-client/src/app/modules/cases/components/cases-table/cases-table.component.html b/eform-client/src/app/modules/cases/components/cases-table/cases-table.component.html
@@ -16,7 +16,7 @@
     </div>
   </div>
   <div class="row p-1 table-responsive no-gutters">
-    <table class="table table-sm table-striped text-center">
+    <table mat-table class="table table-sm table-striped text-center mat-elevation-z8">
       <thead>
       <tr>
         <th scope="col">ID</th>
diff --git a/eform-client/src/app/modules/device-users/components/device-users-page/device-users-page.component.html b/eform-client/src/app/modules/device-users/components/device-users-page/device-users-page.component.html
@@ -11,7 +11,7 @@
 <!--Here you can choose approach as you like: container-row, or flex, or just element with required styles and markup-->
 <div class="container-fluid">
   <div class="row pt-3 table-responsive no-gutters">
-    <table class="table table-sm table-striped text-center">
+    <table mat-table class="table table-sm table-striped text-center mat-elevation-z8">
       <thead>
       <tr>
         <th scope="col">{{ 'Site ID' | translate }}</th>
diff --git a/eform-client/src/app/modules/eforms/components/eform-edit-paring-modal/eform-edit-paring-modal.component.html b/eform-client/src/app/modules/eforms/components/eform-edit-paring-modal/eform-edit-paring-modal.component.html
@@ -5,7 +5,7 @@
         <h3>{{'eForm Pairing'}}</h3>
       </div>
       <div class="modal-body table-responsive">
-        <table class="table table-xs table-bordered text-center">
+        <table mat-table class="table table-xs table-bordered text-center mat-elevation-z8">
           <thead>
           <tr>
             <th>Microting ID</th>
@@ -19,11 +19,10 @@ <h3>{{'eForm Pairing'}}</h3>
             <td class="align-middle">{{siteDto.siteName}}</td>
             <td class="align-middle">
               <div *ngFor="let checkboxModel of deployViewModel.deployCheckboxes">
-                <label class="md-checkbox" *ngIf="checkboxModel.id == siteDto.siteUId">
-                  <input (click)="addToArray($event, checkboxModel.id)"
-                         [checked]="checkboxModel.isChecked" value="{{checkboxModel.isChecked}}" type="checkbox"/>
-                  <span class="md-checkbox--fake"></span>
-                </label>
+                   <mat-checkbox (click)="addToArray($event, checkboxModel.id)"
+                                 [checked]="checkboxModel.isChecked" [value]="checkboxModel.isChecked" color="primary">
+
+                   </mat-checkbox>
               </div>
             </td>
           </tr>
diff --git a/eform-client/src/app/modules/eforms/components/eforms-page/eforms-page.component.html b/eform-client/src/app/modules/eforms/components/eforms-page/eforms-page.component.html
@@ -34,7 +34,7 @@
     </div>
   </div>
   <div class="row p-1 table-responsive no-gutters">
-    <table class="table table-sm table-striped text-center">
+    <table mat-table class="table table-sm table-striped text-center mat-elevation-z8">
       <thead>
       <tr>
         <th scope="col" class="table-header-sortable" id="idSort"
diff --git a/eform-client/src/app/modules/eforms/eforms.module.ts b/eform-client/src/app/modules/eforms/eforms.module.ts
@@ -17,6 +17,7 @@ import {
   EformEditTagsModalComponent,
   EformRemoveEformModalComponent, EformUploadZipModalComponent
 } from './components';
+import {MatCheckboxModule} from '@angular/material';
 
 @NgModule({
   imports: [
@@ -27,7 +28,8 @@ import {
     MDBBootstrapModule,
     EformSharedModule,
     FileUploadModule,
-    FormsModule
+    FormsModule,
+    MatCheckboxModule
   ],
   declarations: [
     EformsPageComponent,
diff --git a/eform-client/src/scss/styles.scss b/eform-client/src/scss/styles.scss
@@ -3,6 +3,7 @@
 @import "components/index";
 @import "utilities/colors";
 @import "libs/index";
+@import '~@angular/material/prebuilt-themes/indigo-pink.css';
 
 // h-100 for base elements
 html {
@@ -40,7 +41,3 @@ gallery {
 .g-backdrop {
   background-color: #e2e2e2;
 }
-
-
-
-

Original file line number	Diff line number	Diff line change
`@@ -59,4 +59,7 @@ export class AppSettingsService extends BaseService {`
`59`	`59`	`resetHeaderSettings(): Observable<OperationResult> {`
`60`	`60`	`return this.get(SettingsMethods.ResetHeaderSettings);`
`61`	`61`	`}`
	`62`	`+ getOneAdminSetting(attribute: string): Observable<OperationDataResult<AdminSettingsModel>> {`
	`63`	`+ return this.get<AdminSettingsModel>(SettingsMethods.GetAdminSettings, attribute);`
	`64`	`+ }`
`62`	`65`	`}`