Merge pull request #52 from Gid733/master

Fix for field group element
microting · Dec 19, 2017 · 7964215 · 7964215
2 parents 5143e1d + ca6d347
commit 7964215
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 40 deletions.
diff --git a/eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj b/eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj
@@ -30,29 +30,29 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.6.4.13\lib\AWSSDK.Core.dll</HintPath>
+    <Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\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.6.4.13\lib\AWSSDK.SQS.dll</HintPath>
+    <Reference Include="AWSSDK.SQS, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\lib\AWSSDK.SQS.dll</HintPath>
     </Reference>
-    <Reference Include="eFormCommunicator, Version=1.6.4.12, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Microting.eForm.1.6.4.13\lib\eFormCommunicator.dll</HintPath>
+    <Reference Include="eFormCommunicator, Version=1.6.4.14, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\lib\eFormCommunicator.dll</HintPath>
     </Reference>
-    <Reference Include="eFormCore, Version=1.6.4.12, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Microting.eForm.1.6.4.13\lib\eFormCore.dll</HintPath>
+    <Reference Include="eFormCore, Version=1.6.4.14, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\lib\eFormCore.dll</HintPath>
     </Reference>
-    <Reference Include="eFormData, Version=1.6.4.12, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Microting.eForm.1.6.4.13\lib\eFormData.dll</HintPath>
+    <Reference Include="eFormData, Version=1.6.4.14, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\lib\eFormData.dll</HintPath>
     </Reference>
-    <Reference Include="eFormShared, Version=1.6.4.12, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Microting.eForm.1.6.4.13\lib\eFormShared.dll</HintPath>
+    <Reference Include="eFormShared, Version=1.6.4.14, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\lib\eFormShared.dll</HintPath>
     </Reference>
-    <Reference Include="eFormSqlController, Version=1.6.4.12, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Microting.eForm.1.6.4.13\lib\eFormSqlController.dll</HintPath>
+    <Reference Include="eFormSqlController, Version=1.6.4.14, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\lib\eFormSqlController.dll</HintPath>
     </Reference>
-    <Reference Include="eFormSubscriber, Version=1.6.4.12, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Microting.eForm.1.6.4.13\lib\eFormSubscriber.dll</HintPath>
+    <Reference Include="eFormSubscriber, Version=1.6.4.14, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\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.Common/packages.config b/eFormAPI/eFormAPI.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.6.4.13" targetFramework="net46" />
+  <package id="Microting.eForm" version="1.6.4.14" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
 </packages>
diff --git a/eFormAPI/eFormAPI/eFormAPI.Web.csproj b/eFormAPI/eFormAPI/eFormAPI.Web.csproj
@@ -67,29 +67,29 @@
       <HintPath>..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.1.6.4.13\lib\AWSSDK.Core.dll</HintPath>
+    <Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\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.6.4.13\lib\AWSSDK.SQS.dll</HintPath>
+    <Reference Include="AWSSDK.SQS, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\lib\AWSSDK.SQS.dll</HintPath>
     </Reference>
-    <Reference Include="eFormCommunicator, Version=1.6.4.12, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Microting.eForm.1.6.4.13\lib\eFormCommunicator.dll</HintPath>
+    <Reference Include="eFormCommunicator, Version=1.6.4.14, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\lib\eFormCommunicator.dll</HintPath>
     </Reference>
-    <Reference Include="eFormCore, Version=1.6.4.12, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Microting.eForm.1.6.4.13\lib\eFormCore.dll</HintPath>
+    <Reference Include="eFormCore, Version=1.6.4.14, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\lib\eFormCore.dll</HintPath>
     </Reference>
-    <Reference Include="eFormData, Version=1.6.4.12, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Microting.eForm.1.6.4.13\lib\eFormData.dll</HintPath>
+    <Reference Include="eFormData, Version=1.6.4.14, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\lib\eFormData.dll</HintPath>
     </Reference>
-    <Reference Include="eFormShared, Version=1.6.4.12, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Microting.eForm.1.6.4.13\lib\eFormShared.dll</HintPath>
+    <Reference Include="eFormShared, Version=1.6.4.14, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\lib\eFormShared.dll</HintPath>
     </Reference>
-    <Reference Include="eFormSqlController, Version=1.6.4.12, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Microting.eForm.1.6.4.13\lib\eFormSqlController.dll</HintPath>
+    <Reference Include="eFormSqlController, Version=1.6.4.14, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\lib\eFormSqlController.dll</HintPath>
     </Reference>
-    <Reference Include="eFormSubscriber, Version=1.6.4.12, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Microting.eForm.1.6.4.13\lib\eFormSubscriber.dll</HintPath>
+    <Reference Include="eFormSubscriber, Version=1.6.4.14, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Microting.eForm.1.6.4.14\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.6.4.13" targetFramework="net46" />
+  <package id="Microting.eForm" version="1.6.4.14" 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/...-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.html b/...-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.html
@@ -56,11 +56,12 @@
           <div *ngSwitchCase="'Signature'">
             <element-signature [(fieldValue)]="dataItem.fieldValues[0]"></element-signature>
           </div>
+          <div *ngSwitchCase="'FieldContainer'">
+            <element-container [(fieldValue)]="dataItem.dataItemList" [dataItemLabel]="dataItem.description.inderValue"></element-container>
+          </div>
           <div *ngSwitchDefault></div>
         </div>
-        <div *ngIf="dataItem.label == 'Group open/close'">
-          <element-container [(fieldValue)]="dataItem.dataItemList" [dataItemLabel]="dataItem.description.inderValue"></element-container>
-        </div>
+
       </td>
     </tr>
   </ng-container>

diff --git a/...modules/cases/components/case-elements/element-container/element-container.component.html b/...modules/cases/components/case-elements/element-container/element-container.component.html
@@ -1,8 +1,13 @@
 <div class="panel panel-default">
   <div class="panel-heading" (click)="isCollapsed = !isCollapsed" style="cursor: pointer">
-      <strong>{{dataItemLabel}}</strong>
-        <i class="glyphicon glyphicon-plus" *ngIf="isCollapsed"></i>
-        <i class="glyphicon glyphicon-minus" *ngIf="!isCollapsed"></i>
+<ng-container *ngIf="isCollapsed">
+  <strong>Open group</strong> <i class="glyphicon glyphicon-plus" style="margin-left: 5px;"></i>
+</ng-container>
+<ng-container *ngIf="!isCollapsed">
+  <strong>Close group</strong> <i class="glyphicon glyphicon-minus" style="margin-left: 5px;"></i>
+</ng-container>
+
+
   </div>
   <div [collapse]="isCollapsed" class="panel-body" >
     <ng-container *ngIf="dataItemList">