Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
uphrh-smf-form
Commits
60ba2796
Commit
60ba2796
authored
2 years ago
by
sarojsingh2021
Browse files
Options
Download
Patches
Plain Diff
fix flow
parent
d627c170
master
cvs_download
delete-form
inspection-flow-changes
institute-district
lat-long
1 merge request
!6
Inspection flow changes
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/com/tarento/formservice/model/IncomingData.java
+1
-1
...main/java/com/tarento/formservice/model/IncomingData.java
src/main/java/com/tarento/formservice/service/impl/FormsServiceImpl.java
+4
-4
...om/tarento/formservice/service/impl/FormsServiceImpl.java
with
5 additions
and
5 deletions
+5
-5
src/main/java/com/tarento/formservice/model/IncomingData.java
+
1
−
1
View file @
60ba2796
...
...
@@ -33,6 +33,6 @@ public class IncomingData {
private
String
reviewedDate
;
private
String
inspectionDate
;
private
String
inspectionCompletedDate
;
private
Boolean
inspectionCompleted
;
private
Boolean
inspectionCompleted
=
false
;
}
This diff is collapsed.
Click to expand it.
src/main/java/com/tarento/formservice/service/impl/FormsServiceImpl.java
+
4
−
4
View file @
60ba2796
...
...
@@ -916,9 +916,9 @@ public class FormsServiceImpl implements FormsService {
}
assignee
.
setConsentDate
(
DateUtils
.
getYyyyMmDdInUTC
());
}
else
if
(
StringUtils
.
isBlank
(
assignee
.
getStatus
()))
{
}
/*
else if (StringUtils.isBlank(assignee.getStatus())) {
inspectionCompleted = Boolean.FALSE;
}
}
*/
}
}
if
(
incomingData
.
getInspectionCompleted
())
{
...
...
@@ -926,7 +926,7 @@ public class FormsServiceImpl implements FormsService {
}
// allow only lead inspector to submit inspection details
if
(
isLeadIns
)
{
//
if (isLeadIns) {
incomingData
.
setInspection
(
applicationData
.
getInspection
());
incomingData
.
setInspectionDate
(
DateUtils
.
getYyyyMmDdInUTC
());
incomingData
.
getInspection
().
setInspectionDate
(
DateUtils
.
getYyyyMmDdInUTC
());
...
...
@@ -949,7 +949,7 @@ public class FormsServiceImpl implements FormsService {
inspectionCompleted
?
Constants
.
WorkflowActions
.
COMPLETED_INSPECTION
:
Constants
.
WorkflowActions
.
LEAD_INSPECTION_COMPLETED
);
return
response
;
}
//
}
}
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
String
.
format
(
Constants
.
EXCEPTION
,
"submitInspection"
,
e
.
getMessage
()));
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets