From 9dbb326f2843aa15c61256317213fe9484e1965c Mon Sep 17 00:00:00 2001 From: Gid Date: Thu, 1 Feb 2018 14:41:57 +0200 Subject: [PATCH] Added update for all cases & SDK version update --- eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj | 12 ++++++------ eFormAPI/eFormAPI.Common/packages.config | 6 +++--- eFormAPI/eFormAPI/Controllers/CasesController.cs | 4 ++++ eFormAPI/eFormAPI/eFormAPI.Web.csproj | 12 ++++++------ eFormAPI/eFormAPI/packages.config | 6 +++--- .../components/cases-edit/cases-edit.component.css | 3 +++ .../components/cases-edit/cases-edit.component.html | 7 ++++++- .../components/cases-edit/cases-edit.component.ts | 7 ++++++- 8 files changed, 37 insertions(+), 20 deletions(-) create mode 100644 eform-client/src/app/modules/cases/components/cases-edit/cases-edit.component.css diff --git a/eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj b/eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj index 3d6f4550b1..5a4098492d 100644 --- a/eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj +++ b/eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj @@ -56,14 +56,14 @@ ..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll True - - ..\packages\Microting.eForm.2.1.55\lib\net45\Microting.eForm.dll + + ..\packages\Microting.eForm.2.1.76\lib\net45\Microting.eForm.dll - - ..\packages\MySql.Data.6.9.10\lib\net45\MySql.Data.dll + + ..\packages\MySql.Data.6.9.11\lib\net45\MySql.Data.dll - - ..\packages\MySql.Data.Entity.6.9.10\lib\net45\MySql.Data.Entity.EF6.dll + + ..\packages\MySql.Data.Entity.6.9.11\lib\net45\MySql.Data.Entity.EF6.dll ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/eFormAPI/eFormAPI.Common/packages.config b/eFormAPI/eFormAPI.Common/packages.config index fc10b0f139..9f98c53cc2 100644 --- a/eFormAPI/eFormAPI.Common/packages.config +++ b/eFormAPI/eFormAPI.Common/packages.config @@ -7,9 +7,9 @@ - - - + + + diff --git a/eFormAPI/eFormAPI/Controllers/CasesController.cs b/eFormAPI/eFormAPI/Controllers/CasesController.cs index a42adfdbbb..15aeac87c4 100644 --- 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 index 1d882f131c..cfa9224237 100644 --- a/eFormAPI/eFormAPI/eFormAPI.Web.csproj +++ b/eFormAPI/eFormAPI/eFormAPI.Web.csproj @@ -127,14 +127,14 @@ ..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll - - ..\packages\Microting.eForm.2.1.55\lib\net45\Microting.eForm.dll + + ..\packages\Microting.eForm.2.1.76\lib\net45\Microting.eForm.dll - - ..\packages\MySql.Data.6.9.10\lib\net45\MySql.Data.dll + + ..\packages\MySql.Data.6.9.11\lib\net45\MySql.Data.dll - - ..\packages\MySql.Data.Entity.6.9.10\lib\net45\MySql.Data.Entity.EF6.dll + + ..\packages\MySql.Data.Entity.6.9.11\lib\net45\MySql.Data.Entity.EF6.dll ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/eFormAPI/eFormAPI/packages.config b/eFormAPI/eFormAPI/packages.config index f9980993db..d0fd1595bc 100644 --- a/eFormAPI/eFormAPI/packages.config +++ b/eFormAPI/eFormAPI/packages.config @@ -38,10 +38,10 @@ - + - - + + 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 new file mode 100644 index 0000000000..ab25914962 --- /dev/null +++ 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 index 5a33107c8d..94af82bd11 100644 --- 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 @@


  • - + +
    • +
  • +

    Updating cases, please wait...

    • 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 index 5b12d07fc5..078d37839d 100644 --- 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; 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'}); } });