Updated SDK, Added gallery & Geo pin

Gid733 · Gid733 · commit b9893581a47c · 2017-08-17T15:25:55.000+03:00
diff --git a/eFormAPI/eFormAPI/Controllers/TemplatesController.cs b/eFormAPI/eFormAPI/Controllers/TemplatesController.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.IdentityModel.Tokens;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -41,7 +40,7 @@ public OperationDataResult<List<Template_Dto>> Index()
                                 System.Web.Hosting.HostingEnvironment.MapPath("~/bin/Input.txt"));
 
                         string connectionStr = lines.First();
-                        AdminTools adminTool = new AdminTools(connectionStr, false);
+                        AdminTools adminTool = new AdminTools(connectionStr);
                         adminTool.DbSettingsReloadRemote();
                         return new OperationDataResult<List<Template_Dto>>(false, "Check connection string");
                     }
diff --git a/eFormAPI/eFormAPI/Infrastructure/Helpers/EFormCoreHelper.cs b/eFormAPI/eFormAPI/Infrastructure/Helpers/EFormCoreHelper.cs
@@ -67,9 +67,9 @@ public Core GetCore()
             _core.HandleCaseDeleted += EventCaseDeleted;
             _core.HandleFileDownloaded += EventFileDownloaded;
             _core.HandleSiteActivated += EventSiteActivated;
-            _core.HandleEventLog += EventLog;
-            _core.HandleEventMessage += EventMessage;
-            _core.HandleEventWarning += EventWarning;
+            //_core.HandleEventLog += EventLog;
+            //_core.HandleEventMessage += EventMessage;
+            //_core.HandleEventWarning += EventWarning;
             _core.HandleEventException += EventException;
 
             running = _core.StartSqlOnly(connectionStr);
diff --git a/eFormAPI/eFormAPI/eFormAPI.Web.csproj b/eFormAPI/eFormAPI/eFormAPI.Web.csproj
@@ -62,31 +62,31 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\AWSSDK.Core.dll</HintPath>
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\AWSSDK.Core.dll</HintPath>
     </Reference>
     <Reference Include="AWSSDK.SQS, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\AWSSDK.SQS.dll</HintPath>
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\AWSSDK.SQS.dll</HintPath>
     </Reference>
-    <Reference Include="eFormCommunicator, Version=1.5.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\eFormCommunicator.dll</HintPath>
+    <Reference Include="eFormCommunicator, Version=1.6.1.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\eFormCommunicator.dll</HintPath>
     </Reference>
-    <Reference Include="eFormCore, Version=1.5.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\eFormCore.dll</HintPath>
+    <Reference Include="eFormCore, Version=1.6.1.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\eFormCore.dll</HintPath>
     </Reference>
-    <Reference Include="eFormData, Version=1.5.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\eFormData.dll</HintPath>
+    <Reference Include="eFormData, Version=1.6.1.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\eFormData.dll</HintPath>
     </Reference>
-    <Reference Include="eFormOffice, Version=1.5.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\eFormOffice.dll</HintPath>
+    <Reference Include="eFormOffice, Version=1.6.1.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\eFormOffice.dll</HintPath>
     </Reference>
-    <Reference Include="eFormShared, Version=1.5.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\eFormShared.dll</HintPath>
+    <Reference Include="eFormShared, Version=1.6.1.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\eFormShared.dll</HintPath>
     </Reference>
-    <Reference Include="eFormSqlController, Version=1.5.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\eFormSqlController.dll</HintPath>
+    <Reference Include="eFormSqlController, Version=1.6.1.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\eFormSqlController.dll</HintPath>
     </Reference>
-    <Reference Include="eFormSubscriber, Version=1.5.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\eFormSubscriber.dll</HintPath>
+    <Reference Include="eFormSubscriber, Version=1.6.1.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\eFormSubscriber.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
diff --git a/eFormAPI/eFormAPI/packages.config b/eFormAPI/eFormAPI/packages.config
@@ -33,7 +33,7 @@
   <package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net46" />
   <package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net46" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
-  <package id="Microting.eForm" version="1.5.5.4" targetFramework="net46" />
+  <package id="Microting.eForm" version="1.6.1.3" targetFramework="net46" />
   <package id="Modernizr" version="2.8.3" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
   <package id="NLog" version="4.4.11" targetFramework="net46" />
diff --git a/eFormAPI/eFromAPI.Common/eFromAPI.Common.csproj b/eFormAPI/eFromAPI.Common/eFromAPI.Common.csproj
@@ -31,31 +31,31 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\AWSSDK.Core.dll</HintPath>
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\AWSSDK.Core.dll</HintPath>
     </Reference>
     <Reference Include="AWSSDK.SQS, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\AWSSDK.SQS.dll</HintPath>
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\AWSSDK.SQS.dll</HintPath>
     </Reference>
-    <Reference Include="eFormCommunicator, Version=1.5.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\eFormCommunicator.dll</HintPath>
+    <Reference Include="eFormCommunicator, Version=1.6.1.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\eFormCommunicator.dll</HintPath>
     </Reference>
-    <Reference Include="eFormCore, Version=1.5.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\eFormCore.dll</HintPath>
+    <Reference Include="eFormCore, Version=1.6.1.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\eFormCore.dll</HintPath>
     </Reference>
-    <Reference Include="eFormData, Version=1.5.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\eFormData.dll</HintPath>
+    <Reference Include="eFormData, Version=1.6.1.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\eFormData.dll</HintPath>
     </Reference>
-    <Reference Include="eFormOffice, Version=1.5.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\eFormOffice.dll</HintPath>
+    <Reference Include="eFormOffice, Version=1.6.1.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\eFormOffice.dll</HintPath>
     </Reference>
-    <Reference Include="eFormShared, Version=1.5.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\eFormShared.dll</HintPath>
+    <Reference Include="eFormShared, Version=1.6.1.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\eFormShared.dll</HintPath>
     </Reference>
-    <Reference Include="eFormSqlController, Version=1.5.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\eFormSqlController.dll</HintPath>
+    <Reference Include="eFormSqlController, Version=1.6.1.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\eFormSqlController.dll</HintPath>
     </Reference>
-    <Reference Include="eFormSubscriber, Version=1.5.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.5.5.4\lib\eFormSubscriber.dll</HintPath>
+    <Reference Include="eFormSubscriber, Version=1.6.1.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.1.6.1.3\lib\eFormSubscriber.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
diff --git a/eFormAPI/eFromAPI.Common/packages.config b/eFormAPI/eFromAPI.Common/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="EntityFramework" version="6.1.3" targetFramework="net46" />
   <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net46" />
-  <package id="Microting.eForm" version="1.5.5.4" targetFramework="net46" />
+  <package id="Microting.eForm" version="1.6.1.3" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
 </packages>
diff --git a/eform-client/package.json b/eform-client/package.json
@@ -16,6 +16,7 @@
   },
   "private": true,
   "dependencies": {
+    "@agm/core": "^1.0.0-beta.0",
     "@angular/animations": "^4.2.4",
     "@angular/common": "^4.2.4",
     "@angular/compiler": "^4.2.4",
@@ -33,6 +34,7 @@
     "http-proxy": "^1.16.2",
     "jquery": "^3.1.1",
     "moment": "^2.18.1",
+    "ng-gallery": "^0.7.1",
     "ng2-bs3-modal": "^0.10.4",
     "ng2-dnd": "^4.2.0",
     "ngx-bootstrap": "^1.6.6",
diff --git a/eform-client/src/app/app.module.ts b/eform-client/src/app/app.module.ts
@@ -64,7 +64,8 @@ import {AuthGuard} from 'app/guards/auth.guard';
     AdminModule,
     BrowserAnimationsModule,
     CommonModule,
-    DndModule.forRoot()
+    DndModule.forRoot(),
+
   ],
   providers: [
     NotifyService,
diff --git a/eform-client/src/app/models/common/geo-object.model.ts b/eform-client/src/app/models/common/geo-object.model.ts
@@ -0,0 +1,4 @@
+export class GeoObjectModel {
+  latitude: number;
+  longitude: number;
+}
diff --git a/eform-client/src/app/modules/cases/cases.module.ts b/eform-client/src/app/modules/cases/cases.module.ts
@@ -2,6 +2,7 @@ import {FormsModule} from '@angular/forms';
 import {CasesRoutingModule} from './cases-routing.module';
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
+import {GalleryModule} from 'ng-gallery';
 import {CasesComponent} from './components/cases.component';
 import {CasesTableComponent} from './components/cases-table/cases-table.component';
 import {CasesEditComponent} from './components/cases-edit/cases-edit.component';
@@ -19,9 +20,12 @@ import {
   TrumbowygComponent
 } from './components/case-elements';
 
+import {galleryConfig} from 'app/modules/helpers/helpers.module';
+
 @NgModule({
   imports: [
     CommonModule,
+    GalleryModule.forRoot(galleryConfig),
     FormsModule,
     CasesRoutingModule
   ],
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-picture/element-picture.component.html b/eform-client/src/app/modules/cases/components/case-elements/element-picture/element-picture.component.html
@@ -1,9 +1,7 @@
-<div class="row" *ngFor="let fieldValue of fieldValues">
-  <div class="col-md-2">
-    {{fieldValue.id}}
-  </div>
-  <div class="col-md-2">
-    <img width="300px" src="/api/templates/getimage?&filename={{fieldValue.uploadedDataObj.fileName}}"/>
+<div class="row grid">
+  <div class="col-xs-12 col-sm-6 col-md-3 col-lg-2" *ngFor="let image of images; let i = index">
+    <img width="120px" style="margin: 5px 10px 5px 10px; cursor: pointer" [src]="image.src" (click)="gallery.set(i)"/>
+    <a target="_blank" *ngIf="image.googleMapsLat && image.googleMapsLon" href="{{image.googleMapsUrl}}"><i class="fa fa-map-marker fa-2x" aria-hidden="true"></i></a>
   </div>
 </div>
-<br>
+<gallery-modal></gallery-modal>
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-picture/element-picture.component.ts b/eform-client/src/app/modules/cases/components/case-elements/element-picture/element-picture.component.ts
@@ -1,18 +1,38 @@
-import {Component, Input, OnInit} from '@angular/core';
+import {Component, Input, OnChanges, SimpleChanges} from '@angular/core';
 import {CaseFieldValue} from 'app/models';
+import {GalleryService} from 'ng-gallery';
+import {AgmCoreModule} from '@agm/core';
 
 @Component({
   selector: 'element-picture',
   templateUrl: './element-picture.component.html',
   styleUrls: ['./element-picture.component.css']
 })
-export class ElementPictureComponent implements OnInit {
-  @Input() fieldValues: Array<CaseFieldValue> = new Array<CaseFieldValue>();
+export class ElementPictureComponent implements OnChanges {
+  @Input() fieldValues: Array<CaseFieldValue> = [];
+  geoObjects = [];
+  images = [];
 
-  constructor() {
+  constructor(private gallery: GalleryService) {
   }
 
-  ngOnInit() {
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes && changes.fieldValues) {
+      this.fieldValues.forEach(value => {
+        this.geoObjects.push({
+          lon: value.longitude,
+          lat: value.latitude,
+        });
+        this.images.push({
+          src: '/api/templates/getimage?&filename=' + value.uploadedDataObj.fileName,
+          thumbnail: '/api/templates/getimage?&filename=' + value.uploadedDataObj.fileName,
+          text: value.id.toString(),
+          googleMapsLat: value.latitude,
+          googleMapsLon: value.longitude,
+          googleMapsUrl: 'https://www.google.com/maps/place/' + value.latitude + ',' + value.longitude,
+        });
+      });
+      this.gallery.load(this.images);
+    }
   }
-
 }
diff --git a/eform-client/src/app/modules/helpers/galery-config.ts b/eform-client/src/app/modules/helpers/galery-config.ts
@@ -0,0 +1,23 @@
+import {GalleryConfig} from 'ng-gallery';
+
+export const galleryConfig: GalleryConfig = {
+  'style': {
+    'background': '#121519',
+    'width': '900px',
+    'height': '600px'
+  },
+  'animation': 'fade',
+  'loader': false,
+  'description': {
+    'position': 'bottom',
+    'overlay': true,
+    'text': true,
+    'counter': true
+  },
+  'bullets': {},
+  'player': false,
+  'thumbnails': false,
+  'navigation': true,
+  'gestures': false
+};
+
diff --git a/eform-client/src/app/modules/helpers/helpers.module.ts b/eform-client/src/app/modules/helpers/helpers.module.ts
@@ -6,6 +6,7 @@ import {DndModule} from 'ng2-dnd';
 export * from './components'
 export * from './app.constants'
 export * from './operation.models'
+export * from './galery-config'
 
 @NgModule({
   imports: [
diff --git a/eform-client/src/assets/mt_layout.css b/eform-client/src/assets/mt_layout.css
@@ -1171,3 +1171,7 @@
      margin-left: -15px;
    }
  }
+
+ .g-modal {
+   z-index: 5 !important;
+ }
