diff --git a/src/com/linways/api/v1/examRegistration/controller/ExamRegistrationController.php b/src/com/linways/api/v1/examRegistration/controller/ExamRegistrationController.php index 858fc7bd25..45d1671885 100644 --- a/src/com/linways/api/v1/examRegistration/controller/ExamRegistrationController.php +++ b/src/com/linways/api/v1/examRegistration/controller/ExamRegistrationController.php @@ -2418,6 +2418,7 @@ class ExamRegistrationController extends ExamControllerBaseController $isOnlineExam = $params['isOnlineExam']; $isDigitalValuation = $params['isDigitalValuation']; $isDigitalValuationwithoutAnswerScript = $params['isDigitalValuationwithoutAnswerScript']; + $isQuestionWiseMarkEntry = $params['isQuestionWiseMarkEntry']; $examRegistrationId = $params['examRegistrationId']; $subjects = json_decode(json_encode($subjects)); $searchRequest = new SearchExamRegistrationRequest(); @@ -2494,6 +2495,7 @@ class ExamRegistrationController extends ExamControllerBaseController $assessment->instanceId = $currentAssessmentInstance->id; $identifyingContext = $subject->assessmentIdentifyingContext; $identifyingContext->isDigitalValuationwithoutAnswerScript = $isDigitalValuationwithoutAnswerScript ? '1' : '0'; + $identifyingContext->isQuestionWiseMarkEntry = $isQuestionWiseMarkEntry ? '1' : '0'; $assessmentProperies = $subject->assessmentProperties; $assessment->isActive = 1; $assessment->createdBy = $GLOBALS['userId']; @@ -2511,6 +2513,7 @@ class ExamRegistrationController extends ExamControllerBaseController $identifyingContext = null; $identifyingContext['assessmentId'] = $subject->assessmentId; $identifyingContext['type'] = "DIGITAL_VALUATION"; + $identifyingContext['valuationType'] = $isQuestionWiseMarkEntry ? "QUESTION_WISE_MARK_ENTRY" : ""; $identifyingContext['module'] = "EXAM_CONTROLLER"; // $identifyingContext['c'] = $subject->clusterId; $identifyingContext['staffId'] = $currentStaffId;  @@ -2594,6 +2597,7 @@ class ExamRegistrationController extends ExamControllerBaseController $assessment->instanceId = $currentAssessmentInstance->id; $identifyingContext = $subject->assessmentIdentifyingContext; $identifyingContext->isDigitalValuationwithoutAnswerScript = 0; + $identifyingContext->isQuestionWiseMarkEntry = 0; $assessmentProperies = $subject->assessmentProperties; $assessment->isActive = 1; $assessment->createdBy = $GLOBALS['userId']; diff --git a/src/com/linways/core/service/ExamRegistrationSubjectService.php b/src/com/linways/core/service/ExamRegistrationSubjectService.php index 07c9d2f369..87ecaa9c57 100644 --- a/src/com/linways/core/service/ExamRegistrationSubjectService.php +++ b/src/com/linways/core/service/ExamRegistrationSubjectService.php @@ -1083,6 +1083,9 @@ class ExamRegistrationSubjectService extends BaseService if($subject->assessmentIdentifyingContext->isDigitalValuationwithoutAnswerScript && $subject->onlineExamType == 'DIGITAL_VALUATION'){ $subject->onlineExamType = 'DIGITAL_VALUATION_WITHOUT_ANSWER_SCRIPT'; } + if($subject->assessmentIdentifyingContext->isQuestionWiseMarkEntry && $subject->onlineExamType == 'DIGITAL_VALUATION'){ + $subject->onlineExamType = 'QUESTION_WISE_MARK_ENTRY'; + } $uniqueSubjects[$subject->subjectCode.'-'.$subject->subjectName]->batches[$subject->groupId]->groupId = $subject->groupId; $uniqueSubjects[$subject->subjectCode.'-'.$subject->subjectName]->batches[$subject->groupId]->groupName = $subject->groupName; $uniqueSubjects[$subject->subjectCode.'-'.$subject->subjectName]->batches[$subject->groupId]->assessmentProperties = $subject->assessmentProperties; @@ -1148,6 +1151,7 @@ class ExamRegistrationSubjectService extends BaseService $response->considerPublishTimeTable = $examDefinitionRule->considerPublishTimeTable;  $response->isAvoidExamEndTime = $examDefinitionRule->isAvoidExamEndTime == '1' ? true : false;  $response->enableDigitalValuationWithoutAnswerScript = $examDefinitionRule->enableDigitalValuationWithoutAnswerScript == '1' ? true : false;  + $response->enableQuestionWiseMarkEntry = $examDefinitionRule->enableQuestionWiseMarkEntry == '1' ? true : false; $response->enableOnlineExam = $enableOnlineExam;  $response->currentStaffId = (int)$GLOBALS['userId']; }