Skip to content
Snippets Groups Projects
Commit de7b7118 authored by Bilal Hassan's avatar Bilal Hassan
Browse files

after meeting with zoe

-removing unused navigation
-moving the input data a little to the right
-pushing title to the left
-centering min max avg (was bevore shifted a lttle to the right)
parent 7f5b5840
No related branches found
No related tags found
3 merge requests!25Draft: Resolve #78,!7fixUrlPath,!4merge dev into main
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
<div class="header-left"> <div class="header-left">
<h5>{{sumAvg.name}}</h5> <h5>{{sumAvg.name}}</h5>
<h2 *ngIf="sumAvg.measurementType?.toString()=='SOLAR_RADIATION' "> <h2 *ngIf="sumAvg.measurementType?.toString()=='SOLAR_RADIATION' ">
{{sumAvg.value?.toFixed(1)}}{{" "}}w/m<sup>2</sup> {{sumAvg.value?.toFixed(3)}}{{" "}}w/m<sup>2</sup>
</h2> </h2>
<h2 *ngIf="sumAvg.measurementType?.toString()!='SOLAR_RADIATION' "> <h2 *ngIf="sumAvg.measurementType?.toString()!='SOLAR_RADIATION' ">
{{sumAvg.value?.toFixed(1)}}{{" "+unitMapper.get(sumAvg.measurementType+"")}} {{sumAvg.value?.toFixed(3)}}{{" "+unitMapper.get(sumAvg.measurementType+"")}}
</h2> </h2>
<div><h4>{{typeMapper.get( sumAvg.type+"")}}</h4></div> <div><h4>{{typeMapper.get( sumAvg.type+"")}}</h4></div>
</div> </div>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
*ngFor="let dent of dentrometerDailyValue" *ngFor="let dent of dentrometerDailyValue"
[ngStyle]="{'box-shadow':dent.isSensorGroup ? '15px 15px rgb(173,216,230,0.4) ,30px 30px rgb(173,216,230,0.2)':''}"> [ngStyle]="{'box-shadow':dent.isSensorGroup ? '15px 15px rgb(173,216,230,0.4) ,30px 30px rgb(173,216,230,0.2)':''}">
<h1 class="flex font-bold text-4sm mb-6 justify-center">{{dent.name}}</h1> <h1 class="flex font-bold text-4sm mb-6 justify-start ml-5">{{dent.name}}</h1>
<div class="mx-8 flex justify-between"> <div class="mx-8 flex justify-between">
<div class="flex-col content-center items-center justify-center"> <div class="flex-col content-center items-center justify-center">
......
...@@ -52,7 +52,7 @@ app-Cjs-timline { ...@@ -52,7 +52,7 @@ app-Cjs-timline {
// background-color: black; // background-color: black;
justify-content: center; justify-content: center;
min-height: 100px; min-height: 100px;
width: 90%; width: 100%;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-left: 30px; margin-left: 30px;
...@@ -71,9 +71,11 @@ app-Cjs-timline { ...@@ -71,9 +71,11 @@ app-Cjs-timline {
.header-right{ .header-right{
// background-color: brown; // background-color: brown;
padding-right: 30px;
flex: 50%; flex: 50%;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
} }
@media (max-width: 800px) { @media (max-width: 800px) {
.header{ .header{
...@@ -112,6 +114,7 @@ app-Cjs-timline { ...@@ -112,6 +114,7 @@ app-Cjs-timline {
flex-shrink: 0; flex-shrink: 0;
.header-left{ .header-left{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -181,9 +184,11 @@ app-Cjs-timline { ...@@ -181,9 +184,11 @@ app-Cjs-timline {
header{ header{
//no margin justify-content: center;
margin-top: 20px; margin-top: 20px;
display: flex; display: flex;
justify-content: center; margin-left: 20px;
justify-content: start;
align-content: center; align-content: center;
width: 100%; width: 100%;
} }
...@@ -212,7 +217,6 @@ app-Cjs-timline { ...@@ -212,7 +217,6 @@ app-Cjs-timline {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-left: 20px;
margin-bottom: 20px; margin-bottom: 20px;
} }
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<a routerLink="/data" class="w-5 h-5 rounded-full"> <a routerLink="/data" class="w-5 h-5 rounded-full">
<mat-icon class="bg-green-300 rounded-full">forest</mat-icon> <mat-icon class="bg-green-300 rounded-full">forest</mat-icon>
</a> </a>
<!--
<a class=" w-5 h-5 rounded-full"> <a class=" w-5 h-5 rounded-full">
<button> <button>
<mat-icon>home</mat-icon> <mat-icon>home</mat-icon>
...@@ -45,8 +46,8 @@ ...@@ -45,8 +46,8 @@
<button> <button>
<mat-icon>tune</mat-icon> <mat-icon>tune</mat-icon>
</button> </button>
</a> </a>
-->
<a class="w-5 h-5 "> <a class="w-5 h-5 ">
<button [routerLink]='[{ outlets: { homeDash: ["dayData"] } }]'> <button [routerLink]='[{ outlets: { homeDash: ["dayData"] } }]'>
<mat-icon >insert_chart</mat-icon> <mat-icon >insert_chart</mat-icon>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment