Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
aceite-tecnico-frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Renan de Jesus Montenegro da Silva
aceite-tecnico-frontend
Commits
d0e0a43c
Commit
d0e0a43c
authored
Jul 23, 2025
by
RenanMontenegro3
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:"adicção do campo calado_max"
parent
36615b5b
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
83 additions
and
63 deletions
+83
-63
aceite-edit.component.html
...pages/crud-aceites/aceite-edit/aceite-edit.component.html
+29
-54
aceite-edit.component.ts
...p/pages/crud-aceites/aceite-edit/aceite-edit.component.ts
+19
-2
aceite-search.component.html
...s/crud-aceites/aceite-search/aceite-search.component.html
+3
-0
visualizacao-aceite.component.html
...es/visualizacao-aceite/visualizacao-aceite.component.html
+12
-0
navio-add.component.html
src/app/pages/crud-navios/navio-add/navio-add.component.html
+9
-0
navio-add.component.ts
src/app/pages/crud-navios/navio-add/navio-add.component.ts
+9
-7
navio-search.component.html
...ages/crud-navios/navio-search/navio-search.component.html
+2
-0
No files found.
src/app/pages/crud-aceites/aceite-edit/aceite-edit.component.html
View file @
d0e0a43c
...
...
@@ -39,19 +39,22 @@
</mat-form-field>
<mat-form-field
class=
"field small"
appearance=
"outline"
>
<mat-label>
Boca (m)
</mat-label>
<input
matInput
type=
"text"
[currencyMask]=
"{ prefix: '', thousands: '.', decimal: ',' }"
formControlName=
"boca"
>
<input
matInput
type=
"text"
[currencyMask]=
"{ prefix: '', thousands: '.', decimal: ',' }"
formControlName=
"boca"
>
<mat-error
*ngIf=
"empForm.get('boca')?.invalid"
>
{{ getErrorMessage('boca') }}
</mat-error>
</mat-form-field>
</div>
<div
class=
"row"
>
<mat-form-field
class=
"field medium"
appearance=
"outline"
>
<mat-label>
Calado de Entrada
</mat-label>
<input
matInput
type=
"text"
[currencyMask]=
"{ prefix: '', thousands: '.', decimal: ',' }"
formControlName=
"calado_entrada"
>
<input
matInput
type=
"text"
[currencyMask]=
"{ prefix: '', thousands: '.', decimal: ',' }"
formControlName=
"calado_entrada"
>
<mat-error
*ngIf=
"empForm.get('calado_entrada')?.invalid"
>
{{ getErrorMessage('calado_entrada') }}
</mat-error>
</mat-form-field>
<mat-form-field
class=
"field medium"
appearance=
"outline"
>
<mat-label>
Calado de Saída
</mat-label>
<input
matInput
type=
"text"
[currencyMask]=
"{ prefix: '', thousands: '.', decimal: ',' }"
formControlName=
"calado_saida"
>
<input
matInput
type=
"text"
[currencyMask]=
"{ prefix: '', thousands: '.', decimal: ',' }"
formControlName=
"calado_saida"
>
<mat-error
*ngIf=
"empForm.get('calado_saida')?.invalid"
>
{{ getErrorMessage('calado_saida') }}
</mat-error>
</mat-form-field>
</div>
...
...
@@ -63,56 +66,46 @@
</mat-form-field>
<mat-form-field
class=
"field medium"
appearance=
"outline"
>
<mat-label>
Pontal (m)
</mat-label>
<input
matInput
type=
"text"
[currencyMask]=
"{ prefix: '', thousands: '.', decimal: ',' }"
formControlName=
"pontal"
>
<input
matInput
type=
"text"
[currencyMask]=
"{ prefix: '', thousands: '.', decimal: ',' }"
formControlName=
"pontal"
>
<mat-error
*ngIf=
"empForm.get('pontal')?.invalid"
>
{{ getErrorMessage('pontal') }}
</mat-error>
</mat-form-field>
<mat-form-field
class=
"field small"
appearance=
"outline"
>
<mat-form-field
class=
"field small"
appearance=
"outline"
*ngIf=
"selectedCategoriaNome === 'Granel Líquido'"
>
<mat-label>
Ponte Mfold (m)
</mat-label>
<input
matInput
type=
"text"
[currencyMask]=
"{ prefix: '', thousands: '.', decimal: ',' }"
formControlName=
"ponte_mfold"
>
<input
matInput
type=
"text"
[currencyMask]=
"{ prefix: '', thousands: '.', decimal: ',' }"
formControlName=
"ponte_mfold"
>
<mat-error
*ngIf=
"empForm.get('ponte_mfold')?.invalid"
>
{{ getErrorMessage('ponte_mfold') }}
</mat-error>
</mat-form-field>
</div>
<div
class=
"row"
>
<mat-form-field
class=
"field large"
appearance=
"outline"
>
<mat-form-field
class=
"field large"
appearance=
"outline"
*ngIf=
"selectedCategoriaNome === 'Granel Líquido'"
>
<mat-label>
Mfold Quilha (m)
</mat-label>
<input
matInput
type=
"text"
[currencyMask]=
"{ prefix: '', thousands: '.', decimal: ',' }"
formControlName=
"mfold_quilha"
>
<input
matInput
type=
"text"
[currencyMask]=
"{ prefix: '', thousands: '.', decimal: ',' }"
formControlName=
"mfold_quilha"
>
<mat-error
*ngIf=
"empForm.get('mfold_quilha')?.invalid"
>
{{ getErrorMessage('mfold_quilha') }}
</mat-error>
</mat-form-field>
<mat-form-field
class=
"field medium"
appearance=
"outline"
>
<mat-label>
Categoria
</mat-label>
<mat-select
formControlName=
"categoria"
>
<mat-select
formControlName=
"categoria"
(selectionChange)=
"onCategoriaChange($event.value)"
>
<mat-option
*ngFor=
"let cat of categoria"
[value]=
"cat.id"
>
{{ cat.nome }}
</mat-option>
</mat-select>
<mat-error
*ngIf=
"empForm.get('categoria')?.invalid"
>
{{ getErrorMessage('categoria') }}
</mat-error>
</mat-form-field>
<mat-form-field
class=
"field small"
appearance=
"outline"
>
<mat-label>
Flag
</mat-label>
<mat-select
formControlName=
"flag"
>
<mat-select-trigger>
<img
*ngIf=
"selectedCountry"
[src]=
"selectedCountry.flagUrl"
width=
"20"
height=
"15"
alt=
"{{ selectedCountry.name }} flag"
style=
"margin-right: 8px"
/>
<img
*ngIf=
"selectedCountry"
[src]=
"selectedCountry.flagUrl"
width=
"20"
height=
"15"
alt=
"{{ selectedCountry.name }} flag"
style=
"margin-right: 8px"
/>
{{ selectedCountry?.name }}
</mat-select-trigger>
<mat-option
*ngFor=
"let country of countries"
[value]=
"country.id"
(onSelectionChange)=
"onCountrySelected(country)"
>
<img
[src]=
"country.flagUrl"
width=
"20"
height=
"15"
alt=
"{{ country.name }} flag"
style=
"margin-right: 8px"
/>
<mat-option
*ngFor=
"let country of countries"
[value]=
"country.id"
(onSelectionChange)=
"onCountrySelected(country)"
>
<img
[src]=
"country.flagUrl"
width=
"20"
height=
"15"
alt=
"{{ country.name }} flag"
style=
"margin-right: 8px"
/>
{{ country.name }}
</mat-option>
</mat-select>
...
...
@@ -152,13 +145,7 @@
</mat-form-field>
<div
class=
"row file-upload-container"
>
<mat-label
style=
"color:cadetblue"
>
Adicione o documente Q88 da embarcação
</mat-label>
<input
type=
"file"
class=
"file-input"
(change)=
"onFileSelected($event)"
#fileUpload
style=
"display: none"
/>
<input
type=
"file"
class=
"file-input"
(change)=
"onFileSelected($event)"
#fileUpload
style=
"display: none"
/>
<div
class=
"file-upload-content"
>
<div
class=
"file-info"
>
...
...
@@ -166,13 +153,7 @@
</div>
<div
class=
"upload-button-wrapper"
>
<button
mat-mini-fab
color=
"primary"
class=
"upload-btn"
(click)=
"fileUpload.click()"
type=
"button"
>
<button
mat-mini-fab
color=
"primary"
class=
"upload-btn"
(click)=
"fileUpload.click()"
type=
"button"
>
<mat-icon>
attach_file
</mat-icon>
</button>
</div>
...
...
@@ -180,13 +161,7 @@
<div
class=
"uploaded-image-container"
*ngIf=
"imageUrl"
>
<img
[src]=
"imageUrl"
alt=
"Uploaded Image"
class=
"uploaded-image"
/>
<button
mat-mini-fab
color=
"warn"
class=
"remove-image-btn"
(click)=
"removeImage()"
type=
"button"
>
<button
mat-mini-fab
color=
"warn"
class=
"remove-image-btn"
(click)=
"removeImage()"
type=
"button"
>
<mat-icon>
close
</mat-icon>
</button>
</div>
...
...
src/app/pages/crud-aceites/aceite-edit/aceite-edit.component.ts
View file @
d0e0a43c
...
...
@@ -85,9 +85,26 @@ export class AceiteEditComponent implements OnInit {
calado_saida
:
[
''
,
Validators
.
required
],
restricoes
:
[
''
]
});
this
.
empForm
.
get
(
'
categoria
'
)?.
valueChanges
.
subscribe
(
catId
=>
{
const
cat
=
this
.
categoria
.
find
((
c
:
any
)
=>
c
.
id
===
catId
);
if
(
cat
&&
cat
.
nome
===
'
Granel Líquido
'
)
{
this
.
empForm
.
get
(
'
mfold_quilha
'
)?.
setValidators
([
Validators
.
required
]);
this
.
empForm
.
get
(
'
ponte_mfold
'
)?.
setValidators
([
Validators
.
required
]);
}
else
{
this
.
empForm
.
get
(
'
mfold_quilha
'
)?.
clearValidators
();
this
.
empForm
.
get
(
'
ponte_mfold
'
)?.
clearValidators
();
}
this
.
empForm
.
get
(
'
mfold_quilha
'
)?.
updateValueAndValidity
();
});
}
selectedCategoriaNome
:
string
=
''
;
onCategoriaChange
(
catId
:
any
)
{
const
cat
=
this
.
categoria
.
find
((
c
:
any
)
=>
c
.
id
===
catId
);
this
.
selectedCategoriaNome
=
cat
?
cat
.
nome
:
''
;
}
countries
=
[
{
id
:
1
,
name
:
'
Afeganistão
'
,
flagUrl
:
'
https://flagcdn.com/w20/af.png
'
},
...
...
src/app/pages/crud-aceites/aceite-search/aceite-search.component.html
View file @
d0e0a43c
...
...
@@ -64,6 +64,7 @@
</div>
-->
<!--
<div class="row">
<mat-form-field class="field medium" appearance="outline">
...
...
@@ -77,6 +78,8 @@
</mat-form-field>
</div>
</div>
-->
</div>
<div
mat-dialog-actions
class=
"action"
>
<button
mat-raised-button
type=
"button"
color=
"warn"
[mat-dialog-close]=
"false"
>
Cancelar
...
...
src/app/pages/crud-aceites/visualizacao-aceite/visualizacao-aceite.component.html
View file @
d0e0a43c
...
...
@@ -56,6 +56,18 @@
<p
class=
"field full-width"
appearance=
"outline"
>
O gerente está analisando a solicitação para verificar as especificações.
</p>
<p
*ngIf=
"data.bercosSelecionados?.length > 0 "
class=
"field full-width"
appearance=
"outline"
>
<strong>
Preferências de Berços do Usuário:
</strong>
<span
*ngIf=
"data.bercosSelecionados?.length > 0; else semPreferencias"
>
<span
*ngFor=
"let berco of data.bercosSelecionados; let last = last"
>
{{ berco.nome || berco }}
<span
*ngIf=
"!last"
>
,
</span>
</span>
</span>
<ng-template
#semPreferencias
>
Nenhuma preferência informada.
</ng-template>
</p>
</div>
<div
*ngSwitchCase=
"'Y'"
>
<p
class=
"field full-width"
appearance=
"outline"
>
...
...
src/app/pages/crud-navios/navio-add/navio-add.component.html
View file @
d0e0a43c
...
...
@@ -45,6 +45,15 @@
}}
</mat-error>
</mat-form-field>
</div>
<div
class=
"row"
>
<mat-form-field
class=
"field medium"
appearance=
"outline"
>
<mat-label>
Calado Máximo
</mat-label>
<input
matInput
type=
"text"
formControlName=
"calado_maximo"
[currencyMask]=
"{ prefix: '', thousands: '.', decimal: ',' }"
>
<mat-error
*ngIf=
"empForm.get('calado_maximo')?.invalid"
>
{{ getErrorMessage('calado_maximo') }}
</mat-error>
</mat-form-field>
</div>
<div
class=
"row"
>
<mat-form-field
class=
"field large"
appearance=
"outline"
>
<mat-label>
DWT
</mat-label>
...
...
src/app/pages/crud-navios/navio-add/navio-add.component.ts
View file @
d0e0a43c
...
...
@@ -71,6 +71,8 @@ export class NavioAddComponent implements OnInit {
mfold_quilha
:
[
''
,
Validators
.
required
],
categoria
:
[
''
,
Validators
.
required
],
flag
:
[
''
,
Validators
.
required
],
calado_maximo
:
[
''
,
Validators
.
required
],
obs
:
[
''
],
});
this
.
empForm
.
get
(
'
categoria
'
)?.
valueChanges
.
subscribe
(
catId
=>
{
...
...
src/app/pages/crud-navios/navio-search/navio-search.component.html
View file @
d0e0a43c
...
...
@@ -20,6 +20,7 @@
}}
</mat-error>
</mat-form-field>
</div>
<!--
<div class="row">
<mat-form-field class="field medium" appearance="outline">
<mat-label>Data de Início</mat-label>
...
...
@@ -31,6 +32,7 @@
<input matInput type="date" formControlName="dataFim" />
</mat-form-field>
</div>
-->
<!--
<mat-form-field class="field medium" appearance="outline">
<mat-label>Categoria</mat-label>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment