瀏覽代碼

Add final screen

master
Adwaith Rao 3 年之前
父節點
當前提交
3f08442496
共有 9 個文件被更改,包括 98 次插入7 次删除
  1. +3
    -1
      src/app/app.module.ts
  2. +13
    -1
      src/app/layout/notifications/notifications.component.ts
  3. +9
    -0
      src/app/pages/investigate-business-entities-and-individuals/closing-remarks/closing-remarks.component.html
  4. +17
    -0
      src/app/pages/investigate-business-entities-and-individuals/closing-remarks/closing-remarks.component.scss
  5. +25
    -0
      src/app/pages/investigate-business-entities-and-individuals/closing-remarks/closing-remarks.component.spec.ts
  6. +15
    -0
      src/app/pages/investigate-business-entities-and-individuals/closing-remarks/closing-remarks.component.ts
  7. +2
    -1
      src/app/pages/investigate-business-entities-and-individuals/concur-compliance-review/concur-compliance-review.component.html
  8. +6
    -2
      src/app/pages/investigate-business-entities-and-individuals/investigate-business-entities-and-individuals.component.html
  9. +8
    -2
      src/app/pages/investigate-business-entities-and-individuals/investigate-business-entities-and-individuals.component.ts

+ 3
- 1
src/app/app.module.ts 查看文件

@@ -27,6 +27,7 @@ import { TextareaComponent } from './widgets/form/textarea/textarea.component';
import { MultiFileUploadComponent } from './widgets/form/multi-file-upload/multi-file-upload.component';
import { ReviewNonComplianceComponent } from './pages/investigate-business-entities-and-individuals/review-non-compliance/review-non-compliance.component';
import { ConcurComplianceReviewComponent } from './pages/investigate-business-entities-and-individuals/concur-compliance-review/concur-compliance-review.component';
import { ClosingRemarksComponent } from './pages/investigate-business-entities-and-individuals/closing-remarks/closing-remarks.component';

@NgModule({
declarations: [
@@ -52,7 +53,8 @@ import { ConcurComplianceReviewComponent } from './pages/investigate-business-en
TextareaComponent,
MultiFileUploadComponent,
ReviewNonComplianceComponent,
ConcurComplianceReviewComponent
ConcurComplianceReviewComponent,
ClosingRemarksComponent
],
imports: [
BrowserModule,


+ 13
- 1
src/app/layout/notifications/notifications.component.ts 查看文件

@@ -20,9 +20,21 @@ export class NotificationsComponent implements OnInit {
timeStamp: '2 days ago',
redirectionUrl: '/tabs/investigate-business-entities-and-individuals',
}, {
text: 'Request to create a new Committee',
text: 'Request to create a panel',
timeStamp: '1 day ago',
redirectionUrl: '/tabs/investigate-business-entities-and-individuals',
}, {
text: 'Review non-compliance for Entity Corp.',
timeStamp: '4 hours ago',
redirectionUrl: '/tabs/investigate-business-entities-and-individuals',
}, {
text: 'Concur non-compliance for Entity Corp.',
timeStamp: '2 hours ago',
redirectionUrl: '/tabs/investigate-business-entities-and-individuals',
}, {
text: 'Investigation complete',
timeStamp: '1 hours ago',
redirectionUrl: '/tabs/investigate-business-entities-and-individuals',
}, {
text: 'New name application has been submitted',
description: 'A new Applicant in the company name Kimao has applied for an appeal',


+ 9
- 0
src/app/pages/investigate-business-entities-and-individuals/closing-remarks/closing-remarks.component.html 查看文件

@@ -0,0 +1,9 @@
<div class="screen-holder">
<h3>Investigation complete</h3>
<p>The investigation is complete, and the entity is marked as compliant.</p>
<a [routerLink]="['/tabs/e-services']">
<button class="common-button">
Go home
</button>
</a>
</div>

+ 17
- 0
src/app/pages/investigate-business-entities-and-individuals/closing-remarks/closing-remarks.component.scss 查看文件

@@ -0,0 +1,17 @@
.screen-holder {
width: calc(70% - 2rem);
padding: 4rem;
margin: 0 auto;
}

h3 {
font-size: 2rem;
color: var(--secondary);
font-weight: 500;
margin: 2rem 0;
}

p {
font-size: 1.6rem;
margin-bottom: 25px;
}

+ 25
- 0
src/app/pages/investigate-business-entities-and-individuals/closing-remarks/closing-remarks.component.spec.ts 查看文件

@@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { ClosingRemarksComponent } from './closing-remarks.component';

describe('ClosingRemarksComponent', () => {
let component: ClosingRemarksComponent;
let fixture: ComponentFixture<ClosingRemarksComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ ClosingRemarksComponent ]
})
.compileComponents();
});

beforeEach(() => {
fixture = TestBed.createComponent(ClosingRemarksComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});

+ 15
- 0
src/app/pages/investigate-business-entities-and-individuals/closing-remarks/closing-remarks.component.ts 查看文件

@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';

@Component({
selector: 'app-closing-remarks',
templateUrl: './closing-remarks.component.html',
styleUrls: ['./closing-remarks.component.scss']
})
export class ClosingRemarksComponent implements OnInit {

constructor() { }

ngOnInit(): void {
}

}

+ 2
- 1
src/app/pages/investigate-business-entities-and-individuals/concur-compliance-review/concur-compliance-review.component.html 查看文件

@@ -44,4 +44,5 @@
<input type="checkbox" [(ngModel)]="isConcurring" (ngModelChange)="toggleIsConcurring($event)">
<span>The panel agrees with the investigator's findings</span>
</label>
</div>
</div>
</div>

+ 6
- 2
src/app/pages/investigate-business-entities-and-individuals/investigate-business-entities-and-individuals.component.html 查看文件

@@ -9,13 +9,17 @@
<span class="current-page"> Investigating Business Entities and Individuals </span>
</section>

<app-closing-remarks
*ngIf="state === 'CLOSING REMARKS'"
></app-closing-remarks>

<app-check-status
*ngIf="!canExecute"
*ngIf="!canExecute && state !== 'CLOSING REMARKS'"
[status]="state"
[assignedTo]="executingRole"
></app-check-status>

<ng-container *ngIf="canExecute">
<ng-container *ngIf="canExecute && state !== 'CLOSING REMARKS'">
<app-view-case-details
*ngIf="state === 'VIEW INITIAL DETAILS'"
[hasEnoughData]="hasEnoughData"


+ 8
- 2
src/app/pages/investigate-business-entities-and-individuals/investigate-business-entities-and-individuals.component.ts 查看文件

@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';

type State = 'VIEW INITIAL DETAILS'|'ENTER MORE DETAILS'|'ASSIGN COMMITTEE'|'REVIEW NON COMPLIANCE'|'CONCUR COMPLIANCE REVIEW';
type State = 'VIEW INITIAL DETAILS'|'ENTER MORE DETAILS'|'ASSIGN COMMITTEE'|'REVIEW NON COMPLIANCE'|'CONCUR COMPLIANCE REVIEW'|'CLOSING REMARKS';
type Role = 'Investigator'|'Hod'|'Panel';

@Component({
@@ -59,6 +59,10 @@ export class InvestigateBusinessEntitiesAndIndividualsComponent implements OnIni
this.state = 'CONCUR COMPLIANCE REVIEW';
this.executingRole = 'Panel';
break;
case 'CLOSING REMARKS':
this.state = 'CLOSING REMARKS';
this.executingRole = 'Investigator';
break;
default:
this.state = 'VIEW INITIAL DETAILS';
this.executingRole = 'Investigator';
@@ -100,8 +104,10 @@ export class InvestigateBusinessEntitiesAndIndividualsComponent implements OnIni
case 'CONCUR COMPLIANCE REVIEW':
if (!this.isPanelConcurring) {
this.state = 'REVIEW NON COMPLIANCE';
this.executingRole = 'Investigator';
} else {
this.state = 'CLOSING REMARKS';
}
this.executingRole = 'Investigator';
break;
}



Loading…
取消
儲存