Commit 6b2aa5fc by Nilu Committed by Harsh Shah

remove mandatory from template name in assessment criteria template.

fix null pointer when cloning job
parent 1ad4c11d
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<column name="object_id" type="Long" nullable="false" length="11"/> <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_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_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="false" length="100"/> <column name="template_name" type="String" nullable="true" length="100"/>
<column name="user_id" type="Long" length="11" nullable="true"/> <column name="user_id" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
......
...@@ -8,7 +8,7 @@ CREATE TABLE tl_assessment_template ( ...@@ -8,7 +8,7 @@ CREATE TABLE tl_assessment_template (
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
, ,
template_name varchar(100) NOT NULL, template_name varchar(100) NULL,
user_id numeric(12) NULL user_id numeric(12) NULL
); );
......
...@@ -9,7 +9,7 @@ CREATE TABLE tl_assessment_template ( ...@@ -9,7 +9,7 @@ CREATE TABLE tl_assessment_template (
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
, ,
template_name varchar2(100) NOT NULL, template_name varchar2(100) NULL,
user_id number(12) NULL user_id number(12) NULL
); );
......
...@@ -9,7 +9,7 @@ CREATE TABLE tl_assessment_template ( ...@@ -9,7 +9,7 @@ CREATE TABLE tl_assessment_template (
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
, ,
template_name varchar(100) NOT NULL, template_name varchar(100) NULL,
user_id numeric(12) NULL user_id numeric(12) NULL
); );
......
...@@ -9,7 +9,6 @@ import java.util.Map; ...@@ -9,7 +9,6 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import oneit.logging.LogLevel; import oneit.logging.LogLevel;
import oneit.logging.LogMgr; import oneit.logging.LogMgr;
import oneit.objstore.ObjectTransaction;
import oneit.objstore.StorageException; import oneit.objstore.StorageException;
import oneit.servlets.forms.RedisplayResult; import oneit.servlets.forms.RedisplayResult;
import oneit.servlets.forms.SubmissionDetails; import oneit.servlets.forms.SubmissionDetails;
...@@ -30,7 +29,6 @@ public class LoadJobFromTemplateFP extends ORMProcessFormProcessor ...@@ -30,7 +29,6 @@ public class LoadJobFromTemplateFP extends ORMProcessFormProcessor
public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
{ {
HttpServletRequest request = submission.getRequest(); HttpServletRequest request = submission.getRequest();
ObjectTransaction objTran = process.getTransaction();
Job job = (Job) request.getAttribute("Job"); Job job = (Job) request.getAttribute("Job");
Job template = job.getJobTemplate(); Job template = job.getJobTemplate();
...@@ -43,6 +41,11 @@ public class LoadJobFromTemplateFP extends ORMProcessFormProcessor ...@@ -43,6 +41,11 @@ public class LoadJobFromTemplateFP extends ORMProcessFormProcessor
template.cloneJob(job); 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); LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "LoadJobFromTemplateFP completed for ", job);
return RedisplayResult.getInstance(); return RedisplayResult.getInstance();
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<TABLE name="tl_assessment_template" tablePrefix="object" polymorphic="FALSE"> <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"/> <SINGLEREFERENCE name="User" type="SecUser" dbcol="user_id" uniqueGroup="TemplateName"/>
......
...@@ -137,7 +137,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass ...@@ -137,7 +137,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
metaInfo.put ("dbcol", "template_name"); metaInfo.put ("dbcol", "template_name");
metaInfo.put ("length", "100"); metaInfo.put ("length", "100");
metaInfo.put ("mandatory", "true");
metaInfo.put ("name", "TemplateName"); metaInfo.put ("name", "TemplateName");
metaInfo.put ("type", "String"); metaInfo.put ("type", "String");
metaInfo.put ("uniqueGroup", "TemplateName"); metaInfo.put ("uniqueGroup", "TemplateName");
...@@ -265,7 +264,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass ...@@ -265,7 +264,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
oldAndNewIdentical = HELPER_TemplateName.compare (_TemplateName, newTemplateName); oldAndNewIdentical = HELPER_TemplateName.compare (_TemplateName, newTemplateName);
} }
BusinessObjectParser.assertFieldCondition (newTemplateName != null, this, FIELD_TemplateName, "mandatory");
if (FIELD_TemplateName_Validators.length > 0) if (FIELD_TemplateName_Validators.length > 0)
...@@ -1194,7 +1192,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass ...@@ -1194,7 +1192,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
List result = super.getAttributes (); List result = super.getAttributes ();
result.add(HELPER_TemplateName.getAttribObject (getClass (), _TemplateName, true, FIELD_TemplateName)); result.add(HELPER_TemplateName.getAttribObject (getClass (), _TemplateName, false, FIELD_TemplateName));
return result; return result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment