Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
PERFORMA_REPLICA
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
Muhammad Usman
PERFORMA_REPLICA
Commits
6b2aa5fc
Commit
6b2aa5fc
authored
Jul 14, 2017
by
Nilu
Committed by
Harsh Shah
Sep 06, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove mandatory from template name in assessment criteria template.
fix null pointer when cloning job
parent
1ad4c11d
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
10 deletions
+11
-10
AssessmentCriteriaTemplate.xml
cmsWebApp/sql/AssessmentCriteriaTemplate.xml
+1
-1
AssessmentCriteriaTemplate.sql
cmsWebApp/sql/ms/AssessmentCriteriaTemplate.sql
+1
-1
AssessmentCriteriaTemplate.sql
cmsWebApp/sql/oracle/AssessmentCriteriaTemplate.sql
+1
-1
AssessmentCriteriaTemplate.sql
cmsWebApp/sql/postgres/AssessmentCriteriaTemplate.sql
+1
-1
LoadJobFromTemplateFP.java
cmsWebApp/src/performa/form/LoadJobFromTemplateFP.java
+5
-2
AssessmentCriteriaTemplate.xml
cmsWebApp/src/performa/orm/AssessmentCriteriaTemplate.xml
+1
-1
BaseAssessmentCriteriaTemplate.java
...bApp/src/performa/orm/BaseAssessmentCriteriaTemplate.java
+1
-3
No files found.
cmsWebApp/sql/AssessmentCriteriaTemplate.xml
View file @
6b2aa5fc
...
...
@@ -8,7 +8,7 @@
<column
name=
"object_id"
type=
"Long"
nullable=
"false"
length=
"11"
/>
<column
name=
"object_last_updated_date"
type=
"Date"
nullable=
"false"
length=
"22"
/>
<column
name=
"object_created_date"
type=
"Date"
nullable=
"false"
length=
"22"
/>
<column
name=
"template_name"
type=
"String"
nullable=
"
fals
e"
length=
"100"
/>
<column
name=
"template_name"
type=
"String"
nullable=
"
tru
e"
length=
"100"
/>
<column
name=
"user_id"
type=
"Long"
length=
"11"
nullable=
"true"
/>
</NODE>
...
...
cmsWebApp/sql/ms/AssessmentCriteriaTemplate.sql
View file @
6b2aa5fc
...
...
@@ -8,7 +8,7 @@ CREATE TABLE tl_assessment_template (
object_last_updated_date
datetime
DEFAULT
getdate
()
NOT
NULL
,
object_created_date
datetime
DEFAULT
getdate
()
NOT
NULL
,
template_name
varchar
(
100
)
N
OT
N
ULL
,
template_name
varchar
(
100
)
NULL
,
user_id
numeric
(
12
)
NULL
);
...
...
cmsWebApp/sql/oracle/AssessmentCriteriaTemplate.sql
View file @
6b2aa5fc
...
...
@@ -9,7 +9,7 @@ CREATE TABLE tl_assessment_template (
object_last_updated_date
date
DEFAULT
SYSDATE
NOT
NULL
,
object_created_date
date
DEFAULT
SYSDATE
NOT
NULL
,
template_name
varchar2
(
100
)
N
OT
N
ULL
,
template_name
varchar2
(
100
)
NULL
,
user_id
number
(
12
)
NULL
);
...
...
cmsWebApp/sql/postgres/AssessmentCriteriaTemplate.sql
View file @
6b2aa5fc
...
...
@@ -9,7 +9,7 @@ CREATE TABLE tl_assessment_template (
object_last_updated_date
timestamp
DEFAULT
NOW
()
NOT
NULL
,
object_created_date
timestamp
DEFAULT
NOW
()
NOT
NULL
,
template_name
varchar
(
100
)
N
OT
N
ULL
,
template_name
varchar
(
100
)
NULL
,
user_id
numeric
(
12
)
NULL
);
...
...
cmsWebApp/src/performa/form/LoadJobFromTemplateFP.java
View file @
6b2aa5fc
...
...
@@ -9,7 +9,6 @@ import java.util.Map;
import
javax.servlet.http.HttpServletRequest
;
import
oneit.logging.LogLevel
;
import
oneit.logging.LogMgr
;
import
oneit.objstore.ObjectTransaction
;
import
oneit.objstore.StorageException
;
import
oneit.servlets.forms.RedisplayResult
;
import
oneit.servlets.forms.SubmissionDetails
;
...
...
@@ -30,7 +29,6 @@ public class LoadJobFromTemplateFP extends ORMProcessFormProcessor
public
SuccessfulResult
processForm
(
ORMProcessState
process
,
SubmissionDetails
submission
,
Map
params
)
throws
BusinessException
,
StorageException
{
HttpServletRequest
request
=
submission
.
getRequest
();
ObjectTransaction
objTran
=
process
.
getTransaction
();
Job
job
=
(
Job
)
request
.
getAttribute
(
"Job"
);
Job
template
=
job
.
getJobTemplate
();
...
...
@@ -43,6 +41,11 @@ public class LoadJobFromTemplateFP extends ORMProcessFormProcessor
template
.
cloneJob
(
job
);
job
.
setCompletedDetails
(
Boolean
.
TRUE
);
job
.
setCompletedAssessmentType
(
Boolean
.
TRUE
);
job
.
setCompletedRequirements
(
Boolean
.
TRUE
);
job
.
setCompletedCulture
(
Boolean
.
TRUE
);
LogMgr
.
log
(
Job
.
LOG
,
LogLevel
.
PROCESSING1
,
"LoadJobFromTemplateFP completed for "
,
job
);
return
RedisplayResult
.
getInstance
();
...
...
cmsWebApp/src/performa/orm/AssessmentCriteriaTemplate.xml
View file @
6b2aa5fc
...
...
@@ -10,7 +10,7 @@
<TABLE
name=
"tl_assessment_template"
tablePrefix=
"object"
polymorphic=
"FALSE"
>
<ATTRIB
name=
"TemplateName"
type=
"String"
dbcol=
"template_name"
length=
"100"
mandatory=
"true"
uniqueGroup=
"TemplateName"
/>
<ATTRIB
name=
"TemplateName"
type=
"String"
dbcol=
"template_name"
length=
"100"
uniqueGroup=
"TemplateName"
/>
<SINGLEREFERENCE
name=
"User"
type=
"SecUser"
dbcol=
"user_id"
uniqueGroup=
"TemplateName"
/>
...
...
cmsWebApp/src/performa/orm/BaseAssessmentCriteriaTemplate.java
View file @
6b2aa5fc
...
...
@@ -137,7 +137,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
metaInfo
.
put
(
"dbcol"
,
"template_name"
);
metaInfo
.
put
(
"length"
,
"100"
);
metaInfo
.
put
(
"mandatory"
,
"true"
);
metaInfo
.
put
(
"name"
,
"TemplateName"
);
metaInfo
.
put
(
"type"
,
"String"
);
metaInfo
.
put
(
"uniqueGroup"
,
"TemplateName"
);
...
...
@@ -265,7 +264,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
oldAndNewIdentical
=
HELPER_TemplateName
.
compare
(
_TemplateName
,
newTemplateName
);
}
BusinessObjectParser
.
assertFieldCondition
(
newTemplateName
!=
null
,
this
,
FIELD_TemplateName
,
"mandatory"
);
if
(
FIELD_TemplateName_Validators
.
length
>
0
)
...
...
@@ -1194,7 +1192,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
List
result
=
super
.
getAttributes
();
result
.
add
(
HELPER_TemplateName
.
getAttribObject
(
getClass
(),
_TemplateName
,
tru
e
,
FIELD_TemplateName
));
result
.
add
(
HELPER_TemplateName
.
getAttribObject
(
getClass
(),
_TemplateName
,
fals
e
,
FIELD_TemplateName
));
return
result
;
}
...
...
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