Skip to content
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.

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

fix(4as): Change UI/UX of 4As feature and summary dashboard #350

Merged
merged 2 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
(click)="toggleShown($event)"
/>
</label>
<div class="ml-3 text-xl leading-none font-bold flex items-center mr-2">
Risk Assessment
<div class="ml-3 text-lg leading-none font-bold flex items-center mr-1">
Exposure Assessment
</div>
<div class="flex space-x-5 justify-center items-center pl-2">
<div
Expand All @@ -32,7 +32,7 @@
rounded-[4px]
bg-blue-700
py-1
px-2
px-1
align-baseline
font-sans
text-xs
Expand Down Expand Up @@ -158,7 +158,7 @@
></noah-risk-assessment-exposure>
</div>
<div class="mt-1 pl-3">
<div class="text-lg f-f-r capitalize">Population</div>
<div class="text-lg f-f-r capitalize">Flood Prone Population</div>
</div>
</div>

Expand Down Expand Up @@ -217,11 +217,11 @@
<div class="px-6 justify-center items-center">
<button
class="
text-sm
text-xs
font-bold
bg-green-600
rounded-full
px-10
px-4
py-2
my-4
inline-flex
Expand All @@ -240,7 +240,7 @@
(click)="calculateRisk()"
[disabled]="!isButtonEnabled"
>
Calculate Risk
Calculate Flood Exposure
</button>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class RiskAssessmentGroupComponent implements OnInit {
initialPopuOpacityValue: number = 100;

isButtonEnabled: boolean = false;
checkedRain = false;
checkedRain = true;
checkedPopu = false;
checkedShown = false;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@
dark:text-gray-100
"
>
In the event of a Flood 100-year return period, how many people might
be affected and need evacuation in the Philippines?
In the event of a 100-year rain return flood event, how many people
might be affected and would need evacuation?
</p>

<p
Expand All @@ -139,7 +139,9 @@
"
>
<b>Disclaimer:</b> The streams and catchment boundaries presented are
indicative and have not gone through ground validation.
indicative. They have been derived from elevation data obtained using
IfSAR topography and delineated using ArcGIS Hydrological Tools.

<span
role="button"
*ngIf="btnReadMore"
Expand All @@ -148,21 +150,17 @@
>Read more...</span
>
<span class="hidden xl:inline">
These have been derived from elevation data obtained using
Interferometric Synthetic Aperture Radar (IfSAR) technology and
delineated using ArcGIS Hydrological Tools. The UP NOAH Center is
not liable for positioning inaccuracies, discrepancies from
subsequent updates, errors, or data omissions. However, suggestions
for improvement or error notifications are welcome.</span
>
The UP NOAH Center is not liable for positioning inaccuracies,
discrepancies from subsequent updates, errors, or data omissions in
case this system is used. Please follow official sites of government
and use this site only for supplementary information.
</span>
<span *ngIf="mobileDisclaimer">
These have been derived from elevation data obtained using
Interferometric Synthetic Aperture Radar (IfSAR) technology and
delineated using ArcGIS Hydrological Tools. The UP NOAH Center is
not liable for positioning inaccuracies, discrepancies from
subsequent updates, errors, or data omissions. However, suggestions
for improvement or error notifications are welcome.</span
>
The UP NOAH Center is not liable for positioning inaccuracies,
discrepancies from subsequent updates, errors, or data omissions in
case this system is used. Please follow official sites of government
and use this site only for supplementary information.
</span>
</p>
</div>

Expand Down Expand Up @@ -288,7 +286,7 @@
text-center text-gray-600
"
>
No Affected Data
No available 24-hr rainfall forecast
</p>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ const createInitialValue = (): NoahPlaygroundState => ({
expanded: false,
raintypes: {
'rain-forecast': {
shown: false,
shown: true,
opacity: 100,
},
},
Expand Down