Skip to content

Commit 6a8df24

Browse files
sriranjan-ssriranjan-s
authored
Merge pull request #1130 from deepa-s-13/Dev-2.0
OBPAS CHANGES
2 parents 17f28dc + 8f83863 commit 6a8df24

File tree

4 files changed

+32
-73
lines changed

4 files changed

+32
-73
lines changed

‎frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/checkpoint.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.checkpoint-connect-wrap {
2-
padding-bottom: 40px;
2+
padding-bottom: 4px;
33
@apply relative;
44
}
55
.checkpoint-done {
@@ -51,6 +51,8 @@
5151

5252
.checkpoint-comments-wrap {
5353
max-width: 560px;
54+
padding: 4px;
55+
margin-top: 4px;
5456
@apply bg-grey-mid p-sm mt-sm;
5557

5658
h4{

‎frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,13 @@ setWaterCharges(Malbafees/2)
390390
}
391391
function setLessAdjusmentVal(value) {
392392
if(/^[0-9]*$/.test(value)){
393+
if(parseInt(value)>((parseInt(development)?parseInt(development):0)+(parseInt(otherCharges)?parseInt(otherCharges):0)+parseInt(malbafees)+parseInt(labourCess)+parseInt(waterCharges)+parseInt(gaushalaFees))){
394+
alert(t("Less adjustment fees cannot be grater than Total of other P2 fees"))
395+
}
396+
else{
393397
setLessAdjusment(value);
394398
sessionStorage.setItem("lessAdjusment",value)
399+
}
395400
}
396401
else{
397402
alert(t("Please enter numbers"))
@@ -694,7 +699,7 @@ function selectfile(e) {
694699
</a>
695700
}
696701
<Row className="border-none"></Row>
697-
<Row className="border-none" label={t(`BPA_P2_TOTAL_FEE`)} text={`₹ ${(parseInt(development)+parseInt(otherCharges)+parseInt(malbafees)+parseInt(labourCess)+parseInt(waterCharges)+parseInt(gaushalaFees))-parseInt(lessAdjusment)}`} />
702+
<Row className="border-none" label={t(`BPA_P2_TOTAL_FEE`)} text={`₹ ${((parseInt(development)?parseInt(development):0)+(parseInt(otherCharges)?parseInt(otherCharges):0)+parseInt(malbafees)+parseInt(labourCess)+parseInt(waterCharges)+parseInt(gaushalaFees))-(parseInt(lessAdjusment)?parseInt(lessAdjusment):0)}`} />
698703

699704
</StatusTable>
700705
<br></br>

‎frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ScruntinyDetails.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,13 @@ const ScruntinyDetails = ({ scrutinyDetails, paymentsList=[],additionalDetails,a
102102
}
103103
function setLessAdjusmentVal(value) {
104104
if(/^[0-9]*$/.test(value)){
105+
if(parseInt(value)>(parseInt(development)?parseInt(development):0)+(parseInt(otherCharges?parseInt(otherCharges):0))+parseInt(additionalDetails?.selfCertificationCharges?.BPA_MALBA_CHARGES)+parseInt(additionalDetails?.selfCertificationCharges?.BPA_LABOUR_CESS)+parseInt(additionalDetails?.selfCertificationCharges?.BPA_WATER_CHARGES)+parseInt(additionalDetails?.selfCertificationCharges?.BPA_GAUSHALA_CHARGES_CESS)){
106+
alert("Less adjustment fees cannot be grater than Total of other P2 fees")
107+
}
108+
else{
105109
setLessAdjusment(value);
106110
sessionStorage.setItem("lessAdjusment",value)
111+
}
107112
}
108113
else{
109114
//alert("Please enter numbers")
@@ -241,7 +246,7 @@ function selectfile(e) {
241246
</a>
242247
}
243248
<Row className="border-none"></Row>
244-
<Row className="border-none" label={t(`BPA_P2_TOTAL_FEE`)} text={`₹ ${(parseInt(development)+parseInt(otherCharges)+parseInt(additionalDetails?.selfCertificationCharges?.BPA_MALBA_CHARGES)+parseInt(additionalDetails?.selfCertificationCharges?.BPA_LABOUR_CESS)+parseInt(additionalDetails?.selfCertificationCharges?.BPA_WATER_CHARGES)+parseInt(additionalDetails?.selfCertificationCharges?.BPA_GAUSHALA_CHARGES_CESS))-parseInt(lessAdjusment)}`} />
249+
<Row className="border-none" label={t(`BPA_P2_TOTAL_FEE`)} text={`₹ ${((parseInt(development)?parseInt(development):0)+(parseInt(otherCharges?parseInt(otherCharges):0))+parseInt(additionalDetails?.selfCertificationCharges?.BPA_MALBA_CHARGES)+parseInt(additionalDetails?.selfCertificationCharges?.BPA_LABOUR_CESS)+parseInt(additionalDetails?.selfCertificationCharges?.BPA_WATER_CHARGES)+parseInt(additionalDetails?.selfCertificationCharges?.BPA_GAUSHALA_CHARGES_CESS))-(parseInt(lessAdjusment)?parseInt(lessAdjusment):0)}`} />
245250
</div>}
246251
</div>
247252
}

‎frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/config/BPAApproverApplication.js

Lines changed: 17 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -27,74 +27,6 @@ export const configBPAApproverApplication = ({
2727
isCommentRequired = true;
2828
}
2929

30-
if(action?.action=="BLOCK" && action?.state?.state=="PENDINGAPPROVAL"){
31-
return {
32-
label: {
33-
heading: `WF_${action?.action}_APPLICATION`,
34-
submit: `WF_${businessService}_${action?.action}`,
35-
cancel: "BPA_CITIZEN_CANCEL_BUTTON",
36-
},
37-
form: [
38-
{
39-
body: [
40-
{
41-
label: action.isTerminateState || isRejectOrRevocate ? null : t(assigneeLabel || `WF_ROLE_${action.assigneeRoles?.[0]}`),
42-
type: "dropdown",
43-
populators: action.isTerminateState || isRejectOrRevocate ? null : (
44-
<Dropdown
45-
option={approvers}
46-
autoComplete="off"
47-
optionKey="name"
48-
id="fieldInspector"
49-
select={setSelectedApprover}
50-
selected={selectedApprover}
51-
/>
52-
),
53-
},
54-
{
55-
label: action?.action=="BLOCK" && action?.state?.state=="PENDINGAPPROVAL" ? t(`BLOCK_REASON`):null ,
56-
type: "dropdown",
57-
populators: !action?.action=="BLOCK" || !action?.state?.state=="PENDINGAPPROVAL" ? null : (
58-
<Dropdown
59-
option={blockReasonFiltered}
60-
autoComplete="off"
61-
optionKey="name"
62-
id="fieldInspector"
63-
select={setBlockReason}
64-
selected={selectedBlockReason}
65-
isMandatory={true}
66-
/>
67-
),
68-
},
69-
{
70-
label: t("WF_COMMON_COMMENTS"),
71-
type: "textarea",
72-
isMandatory: true,
73-
populators: {
74-
name: "comments",
75-
},
76-
},
77-
{
78-
label: `${t("WF_APPROVAL_UPLOAD_HEAD")}`,
79-
populators: (
80-
<UploadFile
81-
id={"workflow-doc"}
82-
onUpload={selectFile}
83-
onDelete={() => {
84-
setUploadedFile(null);
85-
}}
86-
message={uploadedFile ? `1 ${t(`ES_PT_ACTION_FILEUPLOADED`)}` : t(`CS_ACTION_NO_FILEUPLOADED`)}
87-
accept= "image/*, .pdf, .png, .jpeg, .jpg"
88-
iserror={error}
89-
/>
90-
),
91-
},
92-
],
93-
},
94-
],
95-
};
96-
}
97-
9830
return {
9931
label: {
10032
heading: `WF_${action?.action}_APPLICATION`,
@@ -105,9 +37,9 @@ export const configBPAApproverApplication = ({
10537
{
10638
body: [
10739
{
108-
label: action.isTerminateState || isRejectOrRevocate ? null : t(assigneeLabel || `WF_ROLE_${action.assigneeRoles?.[0]}`),
40+
label: action.isTerminateState || isRejectOrRevocate || (action?.action=="BLOCK" && action?.state?.state=="PENDINGAPPROVAL")|| (action?.action=="FORWARD" && action?.state?.state=="FIELDINSPECTION_PENDING") ? null : t(assigneeLabel || `WF_ROLE_${action.assigneeRoles?.[0]}`),
10941
type: "dropdown",
110-
populators: action.isTerminateState || isRejectOrRevocate ? null : (
42+
populators: (action.isTerminateState || isRejectOrRevocate || (action?.action=="BLOCK" && action?.state?.state=="PENDINGAPPROVAL")|| (action?.action=="FORWARD" && action?.state?.state=="FIELDINSPECTION_PENDING")) ? null : (
11143
<Dropdown
11244
option={approvers}
11345
autoComplete="off"
@@ -118,6 +50,21 @@ export const configBPAApproverApplication = ({
11850
/>
11951
),
12052
},
53+
{
54+
label: (action?.action=="BLOCK" && action?.state?.state=="PENDINGAPPROVAL") ? t(`BLOCK_REASON`):null ,
55+
type: "dropdown",
56+
populators: (action?.action=="BLOCK" && action?.state?.state=="PENDINGAPPROVAL") ? (
57+
<Dropdown
58+
option={blockReasonFiltered}
59+
autoComplete="off"
60+
optionKey="name"
61+
id="fieldInspector"
62+
select={setBlockReason}
63+
selected={selectedBlockReason}
64+
isMandatory={true}
65+
/>
66+
):null ,
67+
},
12168
{
12269
label: t("WF_COMMON_COMMENTS"),
12370
type: "textarea",

0 commit comments

Comments
 (0)