Merge reports print essay questions

Author: gustavobazzo

create-link.bat

@@ -705,82 +705,6 @@ public function reportQuizEssayAnswers($courseId, $cmId, $groupId, $studentId, $
             $vars['studentid'] = $studentId;
         }
 
-        $query = "select * from
-            (select ". $this->sql_uniqueid() ." uniqueId, t1.id course_id, t1.shortname course_name, t2.id cmid, t3.id quiz_id, 
-                t3.name quiz_name, t6.id user_id, t6.firstname first_name, t6.lastname last_name, ". $this->mysqlConn->sql_concat('t6.firstname', "' '", 't6.lastname')." fullname,
-                t6.email, t4.attempt, t4.timefinish attemp_timestamp,
-                (select t5_2.value  from
-                    mdl_question_attempts t5 
-                    inner join mdl_question_attempt_steps t5_1 on t5.id = t5_1.questionattemptid
-                    inner join mdl_question_attempt_step_data t5_2 on t5_1.id = t5_2.attemptstepid and t5_2.name = 'answer'
-                    inner join mdl_qtype_essay_options as t5_3 on t5.questionid = t5_3.questionid
-                    where t5.questionusageid = t4.uniqueid
-                    order by t5_1.sequencenumber desc limit 1) answer                
-                from {course} t1 
-                inner join {course_modules} t2 on t1.id= t2.course 
-                inner join {modules} t2_1 on t2.module = t2_1.id 
-                inner join {quiz} t3 on t2.instance = t3.id 
-                inner join {quiz_attempts} t4 on t4.quiz = t3.id 
-                inner join {user} t6 on t4.userid = t6.id  and t6.deleted = 0 and t6.suspended = 0
-                left join {groups_members} t6_1 on t6.id = t6_1.userid 
-                left join {groups} t6_2 on t6_1.groupid = t6_2.id 
-                where t2_1.name = 'quiz' and t2.id = :cmid  and t1.id = :courseid  and $groupStmt and $studentStmt
-                order by last_name asc, first_name asc, attempt desc) as tab
-                where answer is not null";
-
-        $tmp = $this->getRecordsSQL($query, $vars);
-
-        $result = array();
-
-        if(count($tmp) == 0){
-            return $result;
-        }
-
-        foreach($tmp as $item){
-            //$output = preg_replace('/\s\s+/',' ',$input);
-
-            $answer = html_entity_decode($item->answer);
-            $answer = str_replace( '<', ' <', $item->answer );
-            //$answer = str_replace( '-', '', $item->answer );
-            $answer = strip_tags( $answer );
-            //$item->nbWords = str_word_count($answer);
-            //$item->nbWords = preg_match_all('/\pL+[^\']/u', $answer, $matches);
-            $item->nbWords = preg_match_all('/\pL+/u', $answer, $matches);
-
-            /*echo "<pre>";
-            var_dump($matches);
-            die();*/
-
-            if($onlyLastTry){
-                if(!isset($result[$item->userId])){
-                    $result[$item->userId] = $item;
-                }
-            }
-            else{
-                $result[] = $item;
-            }
-        }
-
-        return array_values($result);
-    }
-
-    public function reportQuizEssayAnswers2($courseId, $cmId, $groupId, $studentId, $onlyLastTry = false){
-        $vars = array();
-        $vars['cmid'] = $cmId;
-        $vars['courseid'] = $courseId;
-
-        $groupStmt = "1";
-        if($groupId > 0){
-            $groupStmt = " t6_2.id = :groupid";
-            $vars['groupid'] = $groupId;
-        }
-
-        $studentStmt = "1";
-        if($studentId > 0){
-            $studentStmt = " t6.id = :studentid";
-            $vars['studentid'] = $studentId;
-        }
-
         $onlyLastTryStmt = "1";
         if($onlyLastTry){
             $onlyLastTryStmt = " t4.attempt = (SELECT MAX(sub_t4.attempt) FROM mdl_quiz_attempts as sub_t4 WHERE sub_t4.quiz = t3.id AND sub_t4.userid = t6.id)";

src/classes/PersistCtrl.php

@@ -432,33 +432,6 @@ public function reportQuizEssayAnswers($request){
             return new WebApiResult(false, false, $ex->GetMessage());
         } 
     }
-
-    public function reportQuizEssayAnswers2($request){
-        try{
-            $courseId = clean_param($request['courseId'], PARAM_INT);
-            $groupId = clean_param($request['groupId'], PARAM_INT);
-            $cmId = clean_param($request['cmId'], PARAM_INT);
-            $studentId = clean_param($request['studentId'], PARAM_INT);
-            $onlyLastTry = (clean_param($request['onlyLastTry'], PARAM_INT) == 1 ? true : false);
-
-            $extraData = new stdClass();
-            $extraData->documentTitle = clean_param($request['documentTitle'], PARAM_RAW);
-            $extraData->supervisorName = clean_param($request['supervisorName'], PARAM_RAW);
-                        
-            $this->canUserAccess('a', $courseId);
-            
-            $data = PersistCtrl::getInstance()->reportQuizEssayAnswers2($courseId, $cmId, $groupId, $studentId, $onlyLastTry);                   
-
-            $pdfWritter = new ReportQuizEssayAnswersPdf();
-            $pdfWritter->SetDataset($data, $extraData);
-            $pdfWritter->PrintOut('I');
-          
-            return new WebApiResult(true);
-        }
-        catch(Exception $ex){
-            return new WebApiResult(false, false, $ex->GetMessage());
-        } 
-    }
     /**
      * This function generates a report of used tags
      * 

src/classes/WebApi.php

@@ -1,6 +1,6 @@
 {
   "name": "recit_dashboard",
-  "version": "v2.0.0-stable",
+  "version": "2.0.1-stable",
   "description": "RÉCIT Dashboard",
   "main": "index.js",
   "scripts": {

src/react/build/index.js

@@ -205,8 +205,6 @@ export class ReportQuiz  extends Component{
                         <a href={`${Options.getGateway(true)}&service=reportQuiz&courseId=${this.props.options.course.id}&groupId=${this.props.options.group.id}&cmId=${this.props.options.cm.id}&output=csv`} target='_blank'>{i18n.get_string('downloadcsv')}</a>
                         <span className='ml-3 mr-3'>|</span>
                         <Button className='p-0' variant='link' onClick={() => this.onShowModal(true, 'reportQuizEssayAnswers')}>{i18n.get_string('printessayquestions')}</Button>
-                        <span className='ml-3 mr-3'>|</span>
-                        <Button className='p-0' variant='link' onClick={() => this.onShowModal(true, 'reportQuizEssayAnswers2')}>{i18n.get_string('printessayquestions') + ' 2'}</Button>
                     </div>                           
                     <PrintEssayQuestionModal show={this.state.printEssayQuestionModal} options={this.props.options} extraOptions={this.state.data} onClose={() => this.onShowModal(false)}/>
                 </div>;
@@ -385,8 +383,8 @@ class PrintEssayQuestionModal extends Component{
             documentTitle: this.state.data.documentTitle,
             supervisorName: this.state.data.supervisorName,
             onlyLastTry: (this.props.extraOptions.onlyLastTry ? '1' : '0'),
-        }
-
+        } 
+ 
         $glVars.webApi.reportQuizEssayAnswers(data);
     }
 

src/react/build/index.js.map

@@ -23,8 +23,8 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2025013000;       // The current module version (Date: YYYYMMDDXX)
-$plugin->release = 'v2.0.0-stable';
+$plugin->version   = 2025013001;       // The current module version (Date: YYYYMMDDXX)
+$plugin->release = 'v2.0.1-stable';
 $plugin->supported = [405, 405];      //  Moodle 3.9.x, 3.10.x and 3.11.x are supported.
 $plugin->requires  = 2024071200.00; // Moodle 4.5.0
 $plugin->component = 'local_recitdashboard';        // Full name of the plugin (used for diagnostics)