diff --git a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/grower-contract-header/grower-contract-header.component.ts b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/grower-contract-header/grower-contract-header.component.ts index 4415adab..31ecf6b5 100644 --- a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/grower-contract-header/grower-contract-header.component.ts +++ b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/grower-contract-header/grower-contract-header.component.ts @@ -160,9 +160,9 @@ export class GrowerContractHeaderComponent { if (routerUrl.indexOf(ResourcesRoutes.VERIFIED_YIELD_GRAIN) > -1 ) { styles = { - 'border': '1px solid #DEC7DE', + 'border': '1px solid #C4C4FF', 'border-radius': '5px', - 'background': '#FFF5FF' + 'background': '#F5F5FF' } } diff --git a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-button/uw-comments-button.component.html b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-button/uw-comments-button.component.html index 79a010d0..26deabf4 100644 --- a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-button/uw-comments-button.component.html +++ b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-button/uw-comments-button.component.html @@ -1,9 +1,9 @@ - - - + diff --git a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-button/uw-comments-button.component.ts b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-button/uw-comments-button.component.ts index 06b8e3de..e0679cfd 100644 --- a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-button/uw-comments-button.component.ts +++ b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-button/uw-comments-button.component.ts @@ -5,15 +5,22 @@ import { UwCommentsDialogComponent } from "../uw-comments-dialog/uw-comments-dia export interface DialogData { underwritingCommentTypeCode: string; + // Inventory and DOP field data annualFieldDetailId: number; + fieldId: number; + fieldName: string; + legalLocation: string; + // DOP policy data growerContractYearId: number; declaredYieldContractGuid: string; policyNumber: string; growerName: string; growerNumber: string; - fieldId: number; - fieldName: string; - legalLocation: string; + // Verified Yield summary data: + verifiedYieldSummaryGuid: string; + commodityName: string, + insuredAcres: string, + // common data uwComments: UnderwritingComment[]; } @@ -33,6 +40,9 @@ export class UwCommentsButtonComponent { @Input() fieldId: number; @Input() fieldName: string; @Input() legalLocation: string; + @Input() verifiedYieldSummaryGuid: string; + @Input() commodityName: string; + @Input() insuredAcres: string; @Input() uwComments: UnderwritingComment[]; @Output() onDone = new EventEmitter(); @@ -66,6 +76,9 @@ export class UwCommentsButtonComponent { fieldId: this.fieldId, fieldName: this.fieldName, legalLocation: this.legalLocation, + verifiedYieldSummaryGuid: this.verifiedYieldSummaryGuid, + commodityName: this.commodityName, + insuredAcres: this.insuredAcres, uwComments: this.uwCommentsForDialog }; } diff --git a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-dialog/uw-comments-dialog.component.html b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-dialog/uw-comments-dialog.component.html index 1f3e053f..0494df9c 100644 --- a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-dialog/uw-comments-dialog.component.html +++ b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-dialog/uw-comments-dialog.component.html @@ -4,6 +4,28 @@
+ +
+
+ Commodity + {{ data.commodityName }} +
+
+ Insured Acres + {{ data.insuredAcres }} +
+
+ +
+
+
+ +
+
+
diff --git a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-dialog/uw-comments-dialog.component.scss b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-dialog/uw-comments-dialog.component.scss index c97e8089..44a7b942 100644 --- a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-dialog/uw-comments-dialog.component.scss +++ b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-dialog/uw-comments-dialog.component.scss @@ -19,6 +19,11 @@ &.comments-info { grid-template-columns: 1fr 1fr 1fr 5fr 1fr; + .vys-comments-header { + display: grid; + grid-template-columns: 2fr 1fr 1fr 2fr 1fr; + } + .dop-comments-header { display: grid; grid-template-columns: 1fr 1.5fr 1fr 3fr 1fr; diff --git a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-dialog/uw-comments-dialog.component.ts b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-dialog/uw-comments-dialog.component.ts index 4734f3c2..533823ba 100644 --- a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-dialog/uw-comments-dialog.component.ts +++ b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/uw-comments/uw-comments-dialog/uw-comments-dialog.component.ts @@ -26,6 +26,8 @@ export class UwCommentsDialogComponent { return "Inventory Comments"; case UW_COMMENT_TYPE_CODE.DOP_GENERAL: return "DOP Comments"; + case UW_COMMENT_TYPE_CODE.VERIFIED_YIELD_GENERAL: + return "Verified Yield Summary Comments" default: return "Underwriting Comments"; } @@ -44,6 +46,7 @@ export class UwCommentsDialogComponent { underwritingComment: '', growerContractYearId: this.data.growerContractYearId, declaredYieldContractGuid: this.data.declaredYieldContractGuid, + verifiedYieldSummaryGuid: this.data.verifiedYieldSummaryGuid, createUser: '', createDate: '', updateUser: '', diff --git a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/verified-yield/amendment-list/verified-yield-amendment-list.component.html b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/verified-yield/amendment-list/verified-yield-amendment-list.component.html index 2028f9aa..c13b9606 100644 --- a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/verified-yield/amendment-list/verified-yield-amendment-list.component.html +++ b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/verified-yield/amendment-list/verified-yield-amendment-list.component.html @@ -1,10 +1,10 @@
-
+
Amendments
-
+
-
verified-yield-amendment:nth-child(2n+1) > #divAmendmentContent { + background: #F5F5FF; +} \ No newline at end of file diff --git a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/verified-yield/amendment-list/verified-yield-amendment-list.component.ts b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/verified-yield/amendment-list/verified-yield-amendment-list.component.ts index e9185c2d..5dbe3e4e 100644 --- a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/verified-yield/amendment-list/verified-yield-amendment-list.component.ts +++ b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/verified-yield/amendment-list/verified-yield-amendment-list.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; import { UntypedFormArray, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { VerifiedYieldAmendment } from 'src/app/conversion/models-yield'; import { AnnualField, CropCommodityList } from 'src/app/conversion/models'; diff --git a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/verified-yield/amendment/verified-yield-amendment.component.html b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/verified-yield/amendment/verified-yield-amendment.component.html index 33964842..eb224c75 100644 --- a/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/verified-yield/amendment/verified-yield-amendment.component.html +++ b/cirras-underwriting-war/cirras-underwriting-war/src/main/angular/src/app/components/verified-yield/amendment/verified-yield-amendment.component.html @@ -1,5 +1,5 @@ -
-
+
+
-
+
edit
-
+
edit
-
+
@@ -61,7 +61,7 @@ matTooltip="Editable field">edit
-
+
@@ -70,7 +70,7 @@ matTooltip="Editable field">edit
-
+