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.

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

Develop to homolog #356

Merged
merged 2 commits into from
Dec 23, 2024
Merged

Develop to homolog #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91c6f36
💄 #340 - Adicionado status em análise
Junior-Shyko Dec 20, 2024
8e0c3f4
Merge pull request #354 from secultce/feature/alterStatusPC
jeff-doliveira1 Dec 23, 2024
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
5 changes: 5 additions & 0 deletions src/protected/application/lib/modules/Diligence/assets/css/diligence/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,3 +279,8 @@
.d-none {
display: none;
}
.label-diligence-status {
color: #085E55;
font-weight: 700;
font-size: 14px;
}
2 changes: 1 addition & 1 deletion src/protected/application/lib/modules/Diligence/assets/js/multi/multi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ $(document).ready(function () {
//Retornando o valor da situação
getSituacion();
$( "#situacion-refo-multi" ).on( "change", function(e) {

sendSituacion(e.target.value);
$("#label-status-actual").html($(this).find("option:selected").text());
$(".multi-itens-select").show();
$("#p-btn-tado").show();

Expand Down
13 changes: 9 additions & 4 deletions ...tected/application/lib/modules/Diligence/layouts/parts/diligence/body-diligence-multi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,15 @@
<?php if ($diligenceAndAnswers):
if ($diligenceAndAnswers[0]->status == EntityDiligence::STATUS_SEND): ?>
<div>

<h5>
<?php i::_e("Diligências enviadas"); ?>
</h5>
<div style="display: flex;justify-content: space-between;">
<h5>
<?php i::_e("Diligências enviadas"); ?>
</h5>
<h5 style="font-size: 14px;">
Status Atual:
<label class="label-diligence-status" id="label-status-actual"></label>
</h5>
</div>
<div style="margin-top: 25px;">
<div style="font-size: 14px; padding: 10px; margin-bottom: 10px;">
<label>
Expand Down
1 change: 1 addition & 0 deletions src/protected/application/lib/modules/Diligence/layouts/parts/multi/multi-select.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<label style="font-weight: 500">Selecione o status da prestação de contas</label>
<select name="" id="situacion-refo-multi" class="form-control-multi">
<option value="all" disabled selected>-- Selecione --</option>
<option value="under_analysis">Em Análise</option>
<option value="approved">Aprovada</option>
<option value="partially">Parcialmente aprovada</option>
<option value="disapproved">Reprovada</option>
Expand Down
Loading