Merge branch 'master' of https://github.com/microting/eform-angular-frontend

renemadsen · renemadsen · commit 10d59c202701 · 2018-02-01T14:45:07.000+01:00
diff --git a/eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj b/eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj
@@ -74,13 +74,13 @@
       <HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microting.eForm, Version=2.1.76.0, Culture=neutral, processorArchitecture=AMD64">
+    <Reference Include="Microting.eForm, Version=2.1.76.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\packages\Microting.eForm.2.1.76\lib\net45\Microting.eForm.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+    <Reference Include="MySql.Data, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
       <HintPath>..\packages\MySql.Data.6.9.11\lib\net45\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data.Entity.EF6, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+    <Reference Include="MySql.Data.Entity.EF6, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
       <HintPath>..\packages\MySql.Data.Entity.6.9.11\lib\net45\MySql.Data.Entity.EF6.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
diff --git a/eFormAPI/eFormAPI/Controllers/CasesController.cs b/eFormAPI/eFormAPI/Controllers/CasesController.cs
@@ -89,6 +89,10 @@ public OperationResult Update(ReplyRequest model)
             try
             {
                 core.CaseUpdate(model.Id, fieldValueList, checkListValueList);
+                var allCases = core.CaseReadAll(model.Id, null, null);
+                foreach (var caseObject in allCases) {
+                    core.CaseUpdateFieldValues(caseObject.Id);
+                }
                 return new OperationResult(true, "Case has been updated");
             }
             catch (Exception)
diff --git a/eFormAPI/eFormAPI/eFormAPI.Web.csproj b/eFormAPI/eFormAPI/eFormAPI.Web.csproj
@@ -127,13 +127,13 @@
     <Reference Include="Microsoft.Owin.Security.OAuth, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
     </Reference>
-    <Reference Include="Microting.eForm, Version=2.1.76.0, Culture=neutral, processorArchitecture=AMD64">
+    <Reference Include="Microting.eForm, Version=2.1.76.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\packages\Microting.eForm.2.1.76\lib\net45\Microting.eForm.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+    <Reference Include="MySql.Data, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
       <HintPath>..\packages\MySql.Data.6.9.11\lib\net45\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data.Entity.EF6, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+    <Reference Include="MySql.Data.Entity.EF6, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
       <HintPath>..\packages\MySql.Data.Entity.6.9.11\lib\net45\MySql.Data.Entity.EF6.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
diff --git a/eFormAPI/eFormAPI/packages.config b/eFormAPI/eFormAPI/packages.config
@@ -38,10 +38,10 @@
   <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="2.1.76" targetFramework="net461" />
+  <package id="Microting.eForm" version="2.1.76" targetFramework="net46" />
   <package id="Modernizr" version="2.8.3" targetFramework="net46" />
-  <package id="MySql.Data" version="6.9.11" targetFramework="net461" />
-  <package id="MySql.Data.Entity" version="6.9.11" targetFramework="net461" />
+  <package id="MySql.Data" version="6.9.11" targetFramework="net46" />
+  <package id="MySql.Data.Entity" version="6.9.11" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
   <package id="NLog" version="4.4.11" targetFramework="net46" />
   <package id="NLog.Config" version="4.4.11" targetFramework="net46" />
diff --git a/eform-client/src/app/modules/cases/components/cases-edit/cases-edit.component.css b/eform-client/src/app/modules/cases/components/cases-edit/cases-edit.component.css
@@ -0,0 +1,3 @@
+.m-t-1 {
+  margin-top: 10px;
+}
diff --git a/eform-client/src/app/modules/cases/components/cases-edit/cases-edit.component.html b/eform-client/src/app/modules/cases/components/cases-edit/cases-edit.component.html
@@ -33,7 +33,12 @@ <h1 class="page-title header-page-title">
             </li>
             <br>
             <li class="text-center">
-              <button class="btn btn-ar btn-danger" (click)="gem()" id="submit_form">Save</button>
+              <button class="btn btn-ar btn-danger" [disabled]="isFormLocked" (click)="gem()" id="submit_form">
+                Save <i *ngIf="isFormLocked" class="fa fa-spinner fa-spin"></i>
+              </button>
+            </li>
+            <li class="text-center m-t-1" *ngIf="isFormLocked">
+              <p>Updating cases, please wait...</p>
             </li>
           </ul>
         </div>
diff --git a/eform-client/src/app/modules/cases/components/cases-edit/cases-edit.component.ts b/eform-client/src/app/modules/cases/components/cases-edit/cases-edit.component.ts
@@ -8,12 +8,14 @@ import {EFormService} from 'app/services';
 
 @Component({
   selector: 'app-cases-edit',
-  templateUrl: './cases-edit.component.html'
+  templateUrl: './cases-edit.component.html',
+  styleUrls: ['./cases-edit.component.css']
 })
 export class CasesEditComponent implements OnInit {
   @ViewChildren(CaseEditElementComponent) editElements: QueryList<CaseEditElementComponent>;
   id: number;
   templateId: number;
+  isFormLocked = false;
   currentTemplate: TemplateDto = new TemplateDto;
   replyElement: ReplyElement = new ReplyElement();
   // REQUEST
@@ -36,6 +38,7 @@ export class CasesEditComponent implements OnInit {
   }
 
   gem() {
+    this.isFormLocked = true;
     this.requestModels = [];
     this.editElements.forEach(x => {
       x.extractData();
@@ -47,9 +50,11 @@ export class CasesEditComponent implements OnInit {
     this.casesService.updateCase(this.replyRequest).subscribe(operation => {
       if (operation && operation.success) {
         this.replyElement = new ReplyElement();
+        this.isFormLocked = false;
         this.router.navigate(['/cases/', this.currentTemplate.id]).then();
         this.notifyService.success({text: operation.message});
       } else {
+        this.isFormLocked = false;
         this.notifyService.error({text: operation.message || 'Error'});
       }
     });

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,10 @@ public OperationResult Update(ReplyRequest model)`
`89`	`89`	`try`
`90`	`90`	`{`
`91`	`91`	`core.CaseUpdate(model.Id, fieldValueList, checkListValueList);`
	`92`	`+ var allCases = core.CaseReadAll(model.Id, null, null);`
	`93`	`+ foreach (var caseObject in allCases) {`
	`94`	`+ core.CaseUpdateFieldValues(caseObject.Id);`
	`95`	`+ }`
`92`	`96`	`return new OperationResult(true, "Case has been updated");`
`93`	`97`	`}`
`94`	`98`	`catch (Exception)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+.m-t-1 {`
	`2`	`+ margin-top: 10px;`
	`3`	`+}`