Skip to content

Commit

Permalink
Merge pull request #78 from lapig-ufg/feature/area-disable
Browse files Browse the repository at this point in the history
Aviso de area desabilitada
  • Loading branch information
James-jamames authored Oct 10, 2024
2 parents de88932 + 93270a7 commit bdefa2b
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<section #area id="area">
<mat-tab-group [(selectedIndex)]="selectedIndexUpload" class="layersConteudo container-upload" mat-stretch-tabs dynamicHeight>
<i class="pi pi-exclamation-triangle" style="display: block; font-size: 6rem; color: grey;"></i>
{{ 'left_sidebar.warning' | translate}}
<!--<mat-tab-group [(selectedIndex)]="selectedIndexUpload" class="layersConteudo container-upload" mat-stretch-tabs dynamicHeight>
<mat-tab>
<ng-template mat-tab-label>
<mat-icon>search</mat-icon>
Expand All @@ -11,7 +13,7 @@
<mat-form-field class="example-full-width">
<mat-label>{{'area.upload_token' | translate}}</mat-label>
<input type="number" min="0" matInput [(ngModel)]="layerFromConsulta.token" (input)="changeTextUpload($event)">
<!-- <input id="input" type="text" pInputText [(ngModel)]="layerFromConsulta.token" appOnlynumber> &nbsp; -->
</mat-form-field>
<i *ngIf="!isMobile" pTooltip="{{'left_sidebar.tutorial_title' | translate}}" class='bx bxs-info-circle btn-help'
(click)="openTutorial()"></i>
Expand Down Expand Up @@ -52,11 +54,6 @@ <h5 class="title-file-card-search ">
{{'area.analyzed_area_title' | translate | uppercase}}</h5>
<div class="card-upload-analysed-content">
<div class="upload-token">
<!-- <button (click)="printAnalyzedAreaReport(true)" class="btn-print" mat-icon-button>-->
<!-- <mat-icon>print</mat-icon>-->
<!-- <mat-spinner [strokeWidth]="2" [diameter]="18" *ngIf="loadingPrintReport" color="primary"-->
<!-- mode="indeterminate" style="margin: 0 auto;"></mat-spinner>-->
<!-- </button>-->
{{'area.analyzed_area_total_area' | translate }}
<strong>
{{layerFromConsulta.analyzedArea.shape_upload.area_upload | number:'1.2-2' }}
Expand Down Expand Up @@ -248,5 +245,5 @@ <h6 class="card-upload-analysed-table-title">
[options]="objectFullScreenChart.options">
</p-chart>
</div>
</p-dialog>
</p-dialog>-->
</section>
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

#area {
margin: 8px;
padding: 8px;
text-align: center;
font-size: 1.5rem;
border-radius: 5px;
box-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
background: white;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,6 @@ export class AreaComponent implements OnInit {
this.job.token = data.token;
this.job.area = data.area;
this.areaService.saveJob(this.job).subscribe(result => {
//console.log(result)
this.displayFormJob = false;
if (data.features.length > 1) {
this.layerFromUpload.loading = false;
Expand Down
1 change: 1 addition & 0 deletions src/client/src/assets/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
}
},
"left_sidebar": {
"warning": "The tool is disabled. Updates coming soon...",
"title": "Menu",
"opacity": "Opacity",
"tutorial_title": "Tutorial Of Analysis Area",
Expand Down
1 change: 1 addition & 0 deletions src/client/src/assets/locales/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
}
},
"left_sidebar": {
"warning": "A ferramenta está desabilitada. Novidades em breve...",
"title": "Menu",
"opacity": "Opacidade",
"tutorial_title": "Tutorial das Análises de Áreas",
Expand Down
12 changes: 6 additions & 6 deletions src/client/src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ export const environment = {
APP_NAME: 'Atlas das Pastagens',
production: false,
GTAG: '',
OWS_API: 'https://ows-homolog.lapig.iesa.ufg.br/api',
OWS: 'https://ows-homolog.lapig.iesa.ufg.br',
OWS_O1: "https://o5.lapig.iesa.ufg.br/ows",
OWS_O2: "https://o6.lapig.iesa.ufg.br/ows",
OWS_O3: "https://o7.lapig.iesa.ufg.br/ows",
OWS_O4: "https://o8.lapig.iesa.ufg.br/ows",
OWS_API: 'https://ows.lapig.iesa.ufg.br/api',
OWS: 'https://ows.lapig.iesa.ufg.br',
OWS_O1: "https://o1.lapig.iesa.ufg.br/ows",
OWS_O2: "https://o2.lapig.iesa.ufg.br/ows",
OWS_O3: "https://o3.lapig.iesa.ufg.br/ows",
OWS_O4: "https://o4.lapig.iesa.ufg.br/ows",
APP_URL: 'https://atlasdev.lapig.iesa.ufg.br',
LAPIG_JOBS: 'https://jobs.lapig.iesa.ufg.br',
LAPIG_DOWNLOAD_API: 'https://download.lapig.iesa.ufg.br',
Expand Down

0 comments on commit bdefa2b

Please sign in to comment.