Skip to content

Commit bcd4876

Browse files
Merge pull request #356 from secultce/develop
Develop to homolog
2 parents 52ad854 + 8e0c3f4 commit bcd4876

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

src/protected/application/lib/modules/Diligence/assets/css/diligence/style.css

+5
Original file line numberDiff line numberDiff line change
@@ -279,3 +279,8 @@
279279
.d-none {
280280
display: none;
281281
}
282+
.label-diligence-status {
283+
color: #085E55;
284+
font-weight: 700;
285+
font-size: 14px;
286+
}

src/protected/application/lib/modules/Diligence/assets/js/multi/multi.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ $(document).ready(function () {
4141
//Retornando o valor da situação
4242
getSituacion();
4343
$( "#situacion-refo-multi" ).on( "change", function(e) {
44-
4544
sendSituacion(e.target.value);
45+
$("#label-status-actual").html($(this).find("option:selected").text());
4646
$(".multi-itens-select").show();
4747
$("#p-btn-tado").show();
4848

src/protected/application/lib/modules/Diligence/layouts/parts/diligence/body-diligence-multi.php

+9-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,15 @@
3535
<?php if ($diligenceAndAnswers):
3636
if ($diligenceAndAnswers[0]->status == EntityDiligence::STATUS_SEND): ?>
3737
<div>
38-
39-
<h5>
40-
<?php i::_e("Diligências enviadas"); ?>
41-
</h5>
38+
<div style="display: flex;justify-content: space-between;">
39+
<h5>
40+
<?php i::_e("Diligências enviadas"); ?>
41+
</h5>
42+
<h5 style="font-size: 14px;">
43+
Status Atual:
44+
<label class="label-diligence-status" id="label-status-actual"></label>
45+
</h5>
46+
</div>
4247
<div style="margin-top: 25px;">
4348
<div style="font-size: 14px; padding: 10px; margin-bottom: 10px;">
4449
<label>

src/protected/application/lib/modules/Diligence/layouts/parts/multi/multi-select.php

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<label style="font-weight: 500">Selecione o status da prestação de contas</label>
77
<select name="" id="situacion-refo-multi" class="form-control-multi">
88
<option value="all" disabled selected>-- Selecione --</option>
9+
<option value="under_analysis">Em Análise</option>
910
<option value="approved">Aprovada</option>
1011
<option value="partially">Parcialmente aprovada</option>
1112
<option value="disapproved">Reprovada</option>

0 commit comments

Comments
 (0)