Skip to content

Update project hookup (#401) #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yzlucas wants to merge 1 commit into from
Closed

Update project hookup (#401) #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ WFPREV_BASE_URL=http://localhost:8080
* This will start the database, liquibase and the backend service
* If you want to also run the API (With GraalVM), run the following command:
```docker compose --profile api up```
* to get GraalVM re-register, run :
```docker compose --profile api up --build```
* NOTE - Windows users may have to fix the line endings in the server/wfprev-api/mvnw file. The simplest way to do this is to run the following command:
```
Open the mvnw file in a text editor (like VS Code or Notepad++).
Expand Down
2 changes: 1 addition & 1 deletion ...gular/src/app/components/create-new-project-dialog/create-new-project-dialog.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ export class CreateNewProjectDialogComponent implements OnInit {
}
else{
this.snackbarService.open(
"Create project failed",
this.messages.projectCreatedFailure,
'OK',
{ duration: 5000, panelClass: 'snackbar-error' }
);
Expand Down
2 changes: 1 addition & 1 deletion ...t/wfprev-war/src/main/angular/src/app/components/edit-project/edit-project.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<!-- Details Tab -->
<mat-tab label="Details">
<div class="details-tab">
<app-project-details></app-project-details>
<app-project-details (projectNameChange)="projectName = $event"></app-project-details>
</div>
</mat-tab>

Expand Down
12 changes: 3 additions & 9 deletions client/wfprev-war/src/main/angular/src/app/components/edit-project/edit-project.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,8 @@ import { ProjectDetailsComponent } from 'src/app/components/edit-project/project
templateUrl: './edit-project.component.html',
styleUrl: './edit-project.component.scss'
})
export class EditProjectComponent implements OnInit {
export class EditProjectComponent {
projectName: string | null = null;

constructor(private route: ActivatedRoute) {}
ngOnInit(): void {
this.route.queryParamMap.subscribe((params) => {
this.projectName = params.get('name');
});
}

}
constructor() {}
}
77 changes: 37 additions & 40 deletions ...in/angular/src/app/components/edit-project/project-details/project-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<div class="details-container">
<form [formGroup]="detailsForm" (ngSubmit)="onSave()" class="form-grid">
<form [formGroup]="detailsForm" class="form-grid" *ngIf="projectDetail">
<div class="form-item">
<label for="projectTypeCode">Project Type<span class="required">*</span></label>
<label>Project Type<span class="required">*</span></label>
<select id="projectTypeCode" formControlName="projectTypeCode">
<option value="FUEL_MGMT">Fuels Management</option>
<option value="FIRE_RESP">Fire Response</option>
<option value="ECOSYS_RES">Ecosystem Restoration</option>
<option *ngFor="let item of projectTypeCode" [value]="item.projectTypeCode">
{{ item.description }}
</option>
</select>
</div>

<div class="form-item">
<label>Funding Stream<span class="required">*</span></label>
<label>Funding Stream</label>
<select id="fundingStream" formControlName="fundingStream">
<option value="fundingStream1">fundingStream1</option>
<option value="fundingStream2">fundingStream2</option>
Expand All @@ -20,11 +20,11 @@


<div class="form-item">
<label for="projectTypeCode">Business/Program Area<span class="required">*</span></label>
<select id="projectTypeCode" formControlName="businessArea">
<option value="area1">area1</option>
<option value="area2">area2</option>
<option value="area3">area3</option>
<label>Business/Program Area<span class="required">*</span></label>
<select id="programAreaGuid" formControlName="programAreaGuid">
<option *ngFor="let item of programAreaCode" [value]="item.programAreaGuid">
{{ item.programAreaName }}
</option>
</select>
</div>

Expand Down Expand Up @@ -69,27 +69,26 @@
</div>

<div class="form-item">
<label for="projectTypeCode">Forest Region</label>
<select id="projectTypeCode" formControlName="forestRegion">
<option value="area1">area1</option>
<option value="area2">area2</option>
<option value="area3">area3</option>
<label>Forest Region</label>
<select id="forestRegionOrgUnitId" formControlName="forestRegionOrgUnitId">
<option *ngFor="let item of forestRegionCode" [value]="item.orgUnitId">
{{ item.orgUnitName }}
</option>
</select>
</div>

<div class="form-item">
<label> Forest District </label>
<input
type="text"
id="forestDistrict"
formControlName="forestDistrict"
placeholder="Enter Forest District Name"
/>
<select id="forestDistrictOrgUnitId" formControlName="forestDistrictOrgUnitId">
<option *ngFor="let item of forestDistrictCode" [value]="item.orgUnitId">
{{ item.orgUnitName }}
</option>
</select>
</div>

<div class="form-item">
<label>Primary Objective<span class="required">*</span></label>
<select id="fundingStream" formControlName="fundingStream">
<select id="fundingStream" formControlName="primaryObjective">
<option value="fundingStream1">Primary Objective1</option>
<option value="fundingStream2">Primary Objective2</option>
<option value="fundingStream3">Primary Objective3</option>
Expand All @@ -98,7 +97,7 @@

<div class="form-item">
<label>Secondary Objective</label>
<select id="fundingStream" formControlName="fundingStream">
<select id="fundingStream" formControlName="secondaryObjective">
<option value="fundingStream1">Secondary Objective1</option>
<option value="fundingStream2">Secondary Objective2</option>
<option value="fundingStream3">Secondary Objective3</option>
Expand All @@ -110,34 +109,33 @@
<input
type="number"
id="totalFundingRequestAmount"
formControlName="totalFundingRequestAmount"
formControlName="secondaryObjectiveRationale"
placeholder="Enter Secondary Objective Rationale"
/>
</div>

<div class="form-item">
<label> BC Parks Region </label>
<input
type="text"
id="bcParksRegion"
formControlName="bcParksRegion"
placeholder="Enter BC PARKS REGION"
/>
<select id="bcParksRegionOrgUnitId" formControlName="bcParksRegionOrgUnitId">
<option *ngFor="let item of bcParksRegionCode" [value]="item.orgUnitId">
{{ item.orgUnitName }}
</option>
</select>
</div>

<div class="form-item">
<label>BC Parks District</label>
<select id="bcParksDistrict" formControlName="bcParksDistrict">
<option value="bcParksDistrict1">bcParksDistrict1</option>
<option value="bcParksDistrict2">bcParksDistrict2</option>
<option value="bcParksDistrict3">bcParksDistrict3</option>
<label>BC Parks Section</label>
<select id="bcParksSectionOrgUnitId" formControlName="bcParksSectionOrgUnitId">
<option *ngFor="let item of bcParksSectionCode" [value]="item.orgUnitId">
{{ item.orgUnitName }}
</option>
</select>
</div>

<div class="footer">
<div class="button-row">
<button class="secondary" (click)="onCancel()">Cancel</button>
<button
<button type="button" (click)="onSave()"
[disabled]="!detailsForm.valid || !detailsForm.dirty"
class="primary">Save
</button>
Expand Down Expand Up @@ -178,7 +176,7 @@
<div class="project-description-footer">
<div class="button-row">
<button class="secondary" (click)="onCancel()">Cancel</button>
<button class="primary" [disabled]="!detailsForm.get('projectDescription')?.dirty">
<button class="primary" [disabled]="!detailsForm.get('projectDescription')?.dirty" (click)="onSave()">
Save
</button>
</div>
Expand All @@ -198,10 +196,9 @@
<input
type="text"
id="coordinates"
formControlName="coordinates"
formControlName="latitude"
placeholder="Enter Latitude/Longitude"
/>
<!-- <button type="button" (click)="onSaveLatLong()">Save</button> -->
<button
class="save-button"
(click)="onSaveLatLong()">
Expand Down
Loading
Loading