code updates

Hyper-M_Portal/admin/index.html

@@ -88,9 +88,6 @@
                 <li>
                   <a href="#sales">Learners</a>
                 </li>
-                <!-- <li>
-                  <a href="#dsesales">DSE Sales</a>
-                </li> -->
               </ul>
             </li>
   

Hyper-M_Portal/admin/module/assessment/assessment.html

@@ -183,13 +183,13 @@
                             </div>
                         </div>
                           <div class="form-group col-sm-12 phone">
-                    <label for="segment" class="control-label ">Segment (<small>only for DSE  role</small>)</label>  
+                    <label for="segment" class="control-label ">Segment</label>  
                   <select id='segment' name="clscategory" ng-model="formData.segment"   class="form-control selectbox"
                      required select-option>
                     <option value="" selected="" disabled="disabled">{{sideselect.formText[20]}}</option>
-                    <option value="0"  >No segment</option>
-                    <option value="1"  >Motorcycle</option>
-                    <option value="2"  >Scooter</option>
+                    <option value="0"  >Student Learner</option>
+                    <option value="1"  >Parents/Guardian</option>
+                    <option value="2"  >Instructor</option>
                   </select>
                   <div class="color_error shake" ng-if="segment_error!=''">
                      <a class="text-left shake">

Hyper-M_Portal/admin/module/bulletin/bulletin.html

@@ -89,13 +89,13 @@
                                     </div>
                                     <div class="clearfix"></div>
                                     <div class="form-group col-sm-12 phone">
-                    <label for="segment" class="control-label ">Segment (<small>only for DSE  role</small>)</label>  
+                    <label for="segment" class="control-label ">Segment</label>  
                   <select id='segment' name="clscategory" ng-model="formData.segment"   class="form-control selectbox"
                      required select-option>
                     <option value="" selected="" disabled="disabled">{{sideselect.formText[4]}}</option>
-                    <option value="0"  >No segment</option>
-                    <option value="1"  >Motorcycle</option>
-                    <option value="2"  >Scooter</option>
+                    <option value="0"  >Student Learner</option>
+                    <option value="1"  >Parents/Guardian</option>
+                    <option value="2"  >Instructor</option>
                   </select>
                   <div class="color_error shake" ng-if="segment_error!=''">
                      <a class="text-left shake">

Hyper-M_Portal/admin/module/content/content.html

@@ -166,13 +166,12 @@
                             </div>
                         </div>
                         <div class="form-group col-sm-12 phone">
-                            <label for="segment" class="control-label ">Segment (
-                                <small>only for DSE role</small>)</label>
+                            <label for="segment" class="control-label ">Segment</label>
                             <select id='segment' name="clscategory" ng-model="formData.segment" class="form-control selectbox" required select-option>
                                 <option value="" selected="" disabled="disabled">{{sideselect.formText[4]}}</option>
-                                <option value="0">No segment</option>
-                                <option value="1">Motorcycle</option>
-                                <option value="2">Scooter</option>
+                                <option value="0"  >Student Learner</option>
+                    			<option value="1"  >Parents/Guardian</option>
+                    			<option value="2"  >Instructor</option>
                             </select>
                             <div class="color_error shake" ng-if="segment_error!=''">
                                 <a class="text-left shake">
@@ -239,13 +238,12 @@
                             </div>
                         </div>
                         <div class="form-group col-sm-12 phone" ng-if="enableeditbox">
-                            <label for="segment" class="control-label ">Segment (
-                                <small>only for DSE role</small>)</label>
+                            <label for="segment" class="control-label ">Segment</label>
                             <select id='segment' name="clscategory" ng-model="formData.segment" class="form-control selectbox" required select-option>
                                 <option value="" selected="" disabled="disabled">{{sideselect.formText[11]}}</option>
-                                <option value="0">No segment</option>
-                                <option value="1">Motorcycle</option>
-                                <option value="2">Scooter</option>
+                                <option value="0"  >Student Learner</option>
+                    			<option value="1"  >Parents/Guardian</option>
+                    			<option value="2"  >Instructor</option>
                             </select>
                             <div class="color_error shake" ng-if="segment_error!=''">
                                 <a class="text-left shake">
@@ -253,13 +251,12 @@
                             </div>
                         </div>
                         <div class="form-group col-sm-12 phone" ng-if="!enableeditbox">
-                            <label for="segment" class="control-label ">Segment (
-                                <small>only for DSE role</small>)</label>
+                            <label for="segment" class="control-label ">Segment</label>
                             <select id='segment' name="clscategory" ng-model="formData.segment" class="form-control selectbox" required select-option>
                                 <option value="" selected="" disabled="disabled">{{sideselect.formText[11]}}</option>
-                                <option ng-if="topicdata==0 && topicdata!=2 && topicdata!=1" value="0">No segment</option>
-                                <option ng-if="topicdata==0 || (topicdata!=2 && topicdata==1)" value="1">Motorcycle</option>
-                                <option ng-if="topicdata==0 || (topicdata!=1 && topicdata==2)" value="2">Scooter</option>
+                                <option ng-if="topicdata==0 && topicdata!=2 && topicdata!=1" value="0">Student Learner</option>
+                                <option ng-if="topicdata==0 || (topicdata!=2 && topicdata==1)" value="1">Parents/Guardian</option>
+                                <option ng-if="topicdata==0 || (topicdata!=1 && topicdata==2)" value="2">Instructor</option>
                             </select>
                             <div class="color_error shake" ng-if="segment_error!=''">
                                 <a class="text-left shake">

Hyper-M_Portal/admin/module/report/enquiry-report/js/enquiry-report.js

@@ -36,7 +36,7 @@ define(['app'], function (app) {
 		$rootScope.formData = {}
 		$("#startDate").val();
 		$("#endDate").val();
-		$scope.segmentarr=[{id:'0',value:'Both'},{id:'1',value:'Motorcycle'},{id:'2',value:'Scooter'}]
+		$scope.segmentarr=[{id:'0',value:'Student Learner'},{id:'1',value:'Parents/Guardian'},{id:'2',value:'Instructor'}]
 		$scope.viewby = '10';
 		$scope.currentPage = 1;	
 		$scope.dateerror=false;
@@ -374,11 +374,11 @@ define(['app'], function (app) {
 		//==
 		$scope.listtype = function(tempvalue){
 			if(tempvalue == 'conversionratio'){
-				$scope.segmentarr=[{id:'1',value:'Motorcycle'},{id:'2',value:'Scooter'}];
+				$scope.segmentarr=[{id:'1',value:'Parents/Guardian'},{id:'2',value:'Instructor'}];
 				$scope.formData.segment='1';
 
 			}else{
-				$scope.segmentarr=[{id:'0',value:'Both'},{id:'1',value:'Motorcycle'},{id:'2',value:'Scooter'}];
+				$scope.segmentarr=[{id:'0',value:'Student Learner'},{id:'1',value:'Parents/Guardian'},{id:'2',value:'Instructor'}];
 				$scope.formData.segment='0';
 			}
 			$scope.enqtype = tempvalue;

Hyper-M_Portal/admin/module/survey/survey.html

@@ -107,13 +107,13 @@
                         </div>
                         <div class="clearfix"></div>
                          <div class="form-group col-sm-12 phone">
-                    <label for="segment" class="control-label ">Segment (<small>only for DSE  role</small>)</label>  
+                    <label for="segment" class="control-label ">Segment</label>  
                   <select id='segment' name="clscategory" ng-model="formData.segment"   class="form-control selectbox"
                      required select-option>
                     <option value="" selected="" disabled="disabled">{{sideselect.formText[20]}}</option>
-                    <option value="0"  >No segment</option>
-                    <option value="1"  >Motorcycle</option>
-                    <option value="2"  >Scooter</option>
+                    <option value="0"  >Student Learner</option>
+                    <option value="1"  >Parents/Guardian</option>
+                    <option value="2"  >Instructor</option>
                   </select>
                   <div class="color_error shake" ng-if="segment_error!=''">
                      <a class="text-left shake">

Hyper-M_Portal/admin/module/user/user.html

@@ -184,9 +184,9 @@
                      
                      <select id="segment" class="form-control selectbox" ng-model="formData.segment">     
                         <option value="">Segment</option> 
-                        <option value="0">Common</option>
-                        <option value="1">Motorcycle</option>
-                        <option value="2">Scooter</option>
+                        <option value="0">Student Learner</option>
+                        <option value="1">Parents/Guardian</option>
+                        <option value="2">Instructor</option>
                      </select>
                      <div class="color_error shake" ng-if="segment_error!=''">
                       <a class="text-left shake">

Hyper-M_Portal/services/_api/appconfig.php

@@ -351,19 +351,12 @@ define('REWARD_POINT_TWO', "100");
 
 //28 FEB 2020 NEW REWARDS
 define("REWARD_TARGET_SETTING", "500");
-define("REWARD_SALES_PERFOMANCE_FIRST", "1000");
-define("REWARD_SALES_PERFOMANCE_SECOND", "750");
 
 //SET TARGET VALUES
-define('DEF_SET_SALE_TARGET', "5");
-define('GIXXER_SALE_TARGET', "5");
-define('GIXXER_250_SALE_TARGET', "3");
-define('INTRUDER_TARGET', "2");
-define('ACCESS_TARGET', "15");
-define('BURGMAN_TARGET', "10");
+define('SET_TARGET', "5");
 
-define('SEGMENT_MIN_TARGET_MOTORCYCLE', "6");
-define('SEGMENT_MIN_TARGET_SCOOTER', "18");
+define('SEGMENT_MIN_TARGET_STUDENT', "6");
+define('SEGMENT_MIN_TARGET_PARENT', "18");
 
 //REWARD POINTS
 define('REWARD_POINTS_BRONZE', "1000");
@@ -373,12 +366,12 @@ define('REWARD_POINTS_GOLD', "3500");
 /************ DMS API URL **************/
 if (IS_LIVE_SERVER == 1) {
     //LIVE
-    define('SUZ_DMS_URL', '');
-    define('SUZ_TOKEN', '');
+    define('URL', '');
+    define('TOKEN', '');
 } else {
     //DEV
-    define('SUZ_DMS_URL', '');
-    define('SUZ_TOKEN', '');
+    define('URL', '');
+    define('TOKEN', '');
 }
 /************ WEB URL **************/
 define('ASSEST_URL', SITE_URL . 'internal/');
@@ -387,13 +380,8 @@ define('ASSEST_URL', SITE_URL . 'internal/');
 define('LANGUAGE_ARR', 'en_us');
 
 /************ MODEL ID for image IN ex_model ************/
-define('ACCESS_ID', '3');
-define('BURGMAN_ID', '4');
-define('GIXXER_ID', '50');
-define('GIXXER_250_ID', '59');
-define('GIXXER_SF_ID', '43');
-define('GIXXER_SF_250_ID', '42');
-define('INTRUDER_ID', '2');
+define('STUDEND_ID', '3');
+define('PARENT_ID', '4');
 
 /************ AMAZON S3 ACCESS**************/
 if ($_SERVER['HTTP_HOST'] == "localhost:81" || $_SERVER['HTTP_HOST'] == "localhost") {
@@ -402,8 +390,8 @@ if ($_SERVER['HTTP_HOST'] == "localhost:81" || $_SERVER['HTTP_HOST'] == "localho
 	define('S3_REGION','ap-south-1');
 	define('S3_BUCKET','my-cygnusa-bucket-s3');
 } else {
-    define('S3_ACCESSKEY','AKIA2P6OKHL6TIBHIS4I');
-	define('S3_SECRET_ACCESS','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');
+    define('S3_ACCESSKEY','AKIA2P6OKHL66GTRBY7Q');
+	define('S3_SECRET_ACCESS','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');
 	define('S3_REGION','ap-south-1');
 	define('S3_BUCKET','my-cygnusa-bucket-s3');
 }

Hyper-M_Portal/services/_api/controller/crtraining.php

@@ -121,13 +121,13 @@ class crtraining {
 		$segment = escape_str($parent->params[2]);
 
 		if ($segment == 1) {
-    		$segment = 'MOTORCYCLE';
+    		$segment = 'Parents/Guardian';
     	}
     	else if ($segment == 2) {
-    		$segment = 'SCOOTER';
+    		$segment = 'Instructor';
     	}
     	else if ($segment == 3) {
-    		$segment = 'SCOOTER-MOTORCYCLE';
+    		$segment = 'Student Learner';
     	}
 
 		$training_str = "SELECT `assessment_values`, lvl_name FROM ".TABLE_TRAINING_LEVEL." WHERE lvl_id = '" . $title . "' ";
@@ -179,13 +179,13 @@ class crtraining {
         	$todaydate_time = date('Y-m-d H:i:s');
         	// Business Segment Name
         	if ($schedule_arr[0]->business_segment == 2) {
-        		$schedule_arr[0]->segment_name = 'Scooter';
+        		$schedule_arr[0]->segment_name = 'Parents/Guardian';
         	}
         	else if ($schedule_arr[0]->business_segment == 1) {
-        		$schedule_arr[0]->segment_name = 'Motorcycle';
+        		$schedule_arr[0]->segment_name = 'Instructor';
         	}
         	else if ($schedule_arr[0]->business_segment == 3) {
-        		$schedule_arr[0]->segment_name = 'Scooter & Motorcycle';
+        		$schedule_arr[0]->segment_name = 'Student Learner';
         	}
 
 	        // Get Assessment Ids
@@ -2104,13 +2104,13 @@ class crtraining {
 
 				// Business Segment Name
 	        	if ($res_assessment->business_segment == 2) {
-	        		$res_assessment->segment_name = 'Scooter';
+	        		$res_assessment->segment_name = 'Parents/Guardian';
 	        	}
 	        	else if ($res_assessment->business_segment == 1) {
-	        		$res_assessment->segment_name = 'Motorcycle';
+	        		$res_assessment->segment_name = 'Instructor';
 	        	}
 	        	else if ($res_assessment->business_segment == 3) {
-	        		$res_assessment->segment_name = 'Scooter & Motorcycle';
+	        		$res_assessment->segment_name = 'Student Learner';
 	        	}  
 
 				if($res_assessment->training_group_image != '') {
@@ -2356,13 +2356,13 @@ class crtraining {
 
 				// Business Segment Name
 	        	if ($res_assessment->business_segment == 2) {
-	        		$res_assessment->segment_name = 'Scooter';
+	        		$res_assessment->segment_name = 'Parents/Guardian';
 	        	}
 	        	else if ($res_assessment->business_segment == 1) {
-	        		$res_assessment->segment_name = 'Motorcycle';
+	        		$res_assessment->segment_name = 'Instructor';
 	        	}
 	        	else if ($res_assessment->business_segment == 3) {
-	        		$res_assessment->segment_name = 'Scooter & Motorcycle';
+	        		$res_assessment->segment_name = 'Student Learner';
 	        	}
 	        	
 				if($res_assessment->training_group_image != '') {

Hyper-M_Portal/services/_api/controller/dealerenquiry.php

@@ -1883,7 +1883,7 @@ class dealerenquiry
         $explore_url = $brochure_url;
 
         $cond_mail_str1 = "Thank you for showing your interest in HYPER-M.";
-        $cond_mail_str2 = "We hope you had a great experience in exploring our range of motorcycles & Scooters";
+        $cond_mail_str2 = "We hope you had a great experience in exploring our range of Students";
         $email_link = '<a href="' . $explore_url . '" style="font-weight:bold " >Click Here</a> to download the product e-brochure of ' . $checkmodel_data['result'][0]->title . ' ' . $checkmodel_data['result'][0]->variant . '<br>';
 
         $message = '<table width="100%" bgcolor="#dfdfdf" border="0" cellspacing="10" cellpadding="0" style="padding-top:10px;">

Hyper-M_Portal/services/_api/controller/enquiry.php

@@ -1830,7 +1830,7 @@ class enquiry
         $explore_url = $brochure_url;
 
         $cond_mail_str1 = "Thank you for showing your interest in HYPER-M.";
-        $cond_mail_str2 = "We hope you had a great experience in exploring our range of motorcycles & Scooters";
+        $cond_mail_str2 = "We hope you had a great experience in exploring our range of Students";
         $email_link = '<a href="' . $explore_url . '" style="font-weight:bold " >Click Here</a> to download the product e-brochure of ' . $checkmodel_data['result'][0]->title . ' ' . $checkmodel_data['result'][0]->variant . '<br>';
 
         $message = '<table width="100%" bgcolor="#dfdfdf" border="0" cellspacing="10" cellpadding="0" style="padding-top:10px;">

Hyper-M_Portal/services/_api/controller/enquiryreport.php

@@ -280,17 +280,17 @@ class enquiryreport
             case '2':$target_enquiry = $target_sales * 3;
                 break;
             default:
-                //MOTORCYCLE
+                //
                 $m_user_target_str = "SELECT COALESCE(SUM(t.target),0) as data_count FROM " . TABLE_USER_SALETARGET . " t JOIN " . DMS_EMPLOYEE . " as e ON e.smpin=t.smpin JOIN " . DMS_DEALER . " d ON d.dealer_code=e.dealer_code " . $join_table . " WHERE d.is_deleted=0 AND e.status=1 AND  t.sale_month>='" . date('Y-m-', strtotime($start_month)) . "' AND t.sale_month<='" . date('Y-m-t', strtotime($end_month)) . "'  AND e.segment=1 " . $user_cond;
                 $m_user_target_arr = $parent->getQueryValue($m_user_target_str);
                 $mtarget_sales = (count($m_user_target_arr) > 0) ? $m_user_target_arr[0]->data_count : 0;
                 $mtarget_enquiry = $mtarget_sales * 5;
-                //SCOOTER
+                //
                 $s_user_target_str = "SELECT COALESCE(SUM(t.target),0) as data_count FROM " . TABLE_USER_SALETARGET . " t JOIN " . DMS_EMPLOYEE . " as e ON e.smpin=t.smpin JOIN " . DMS_DEALER . " d ON d.dealer_code=e.dealer_code " . $join_table . " WHERE d.is_deleted=0 AND e.status=1 AND  t.sale_month>='" . date('Y-m-', strtotime($start_month)) . "' AND t.sale_month<='" . date('Y-m-t', strtotime($end_month)) . "'  AND e.segment=2 " . $user_cond;
                 $s_user_target_arr = $parent->getQueryValue($s_user_target_str);
                 $starget_sales = (count($s_user_target_arr) > 0) ? $s_user_target_arr[0]->data_count : 0;
                 $starget_enquiry = $starget_sales * 3;
-                //OTHER
+                //
                 $o_user_target_str = "SELECT COALESCE(SUM(t.target),0) as data_count FROM " . TABLE_USER_SALETARGET . " t JOIN " . DMS_EMPLOYEE . " as e ON e.smpin=t.smpin JOIN " . DMS_DEALER . " d ON d.dealer_code=e.dealer_code " . $join_table . " WHERE d.is_deleted=0 AND e.status=1 AND  t.sale_month>='" . date('Y-m-', strtotime($start_month)) . "' AND t.sale_month<='" . date('Y-m-t', strtotime($end_month)) . "'  AND e.segment=0 " . $user_cond;
                 $o_user_target_arr = $parent->getQueryValue($o_user_target_str);
                 $otarget_sales = (count($o_user_target_arr) > 0) ? $o_user_target_arr[0]->data_count : 0;
@@ -616,11 +616,11 @@ class enquiryreport
                 $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, ($mkey + 1));
 
                 switch ($res_user->segment) {
-                    case "1":$segment_str = "Motorcycle";
+                    case "1":$segment_str = "Parents/Guardian";
                         break;
-                    case "2":$segment_str = "Scooter";
+                    case "2":$segment_str = "Instructor";
                         break;
-                    default:$segment_str = "No Segment";
+                    default:$segment_str = "Student Learner";
                         break;
                 }
 

Hyper-M_Portal/services/_api/controller/explore.php

@@ -631,7 +631,7 @@ class explore
         }
         //"16", "17"
         $cond_mail_str1 = (in_array($parent->current_user_role, array("16"))) ? "Thank you for showing your interest in HYPER-M and visiting Dealership." : "Thank you for showing your interest in HYPER-M.";
-        $cond_mail_str2 = (in_array($parent->current_user_role, array("16", "17"))) ? "We hope you had a great experience in exploring our range of motorcycles." : "We hope you had a great experience in exploring our range of motorcycles & Scooters";
+        $cond_mail_str2 = (in_array($parent->current_user_role, array("16", "17"))) ? "We hope you had a great experience in exploring our range of students." : "We hope you had a great experience in exploring our range of students";
 
         $email_link = ($is_brochure == '1') ? '<a href="' . $explore_url . '" style="font-weight:bold " >Click Here</a> to download the product e-brochure for your reference.<br>' : "";
 
@@ -1093,7 +1093,7 @@ Toll Free Number: 1800-121-7996 (Mon-Sat 9AM - 5:30PM)</p>
                 }
 
                 $cond_mail_str1 = (in_array($parent->current_user_role, array("16"))) ? "Thank you for showing your interest in HYPER-M and visiting Dealership." : "Thank you for showing your interest in HYPER-M.";
-                $cond_mail_str2 = (in_array($parent->current_user_role, array("16", "17"))) ? "We hope you had a great experience in exploring our range of motorcycles." : "We hope you had a great experience in exploring our range of motorcycles & Scooters";
+                $cond_mail_str2 = (in_array($parent->current_user_role, array("16", "17"))) ? "We hope you had a great experience in exploring our range of students." : "We hope you had a great experience in exploring our range of students";
 
                 $email_link = ($is_brochure == '1') ? '<a href="' . $explore_url . '" style="font-weight:bold " >Click Here</a> to download the product e-brochure for your reference.<br>' : "";
 

Hyper-M_Portal/services/_api/controller/support.php

@@ -229,11 +229,11 @@ class support
                 $dealer_data = ($res_user->dealer_code != '') ? $res_user->dealer_name : '';
                 $segment = '';
                 switch ($res_user->segment) {
-                    case '0':$segment = 'No segment';
+                    case '0':$segment = 'Student Learner';
                         break;
-                    case '1':$segment = 'Motorcycle';
+                    case '1':$segment = 'Parents/Guardian';
                         break;
-                    case '2':$segment = 'Scootor';
+                    case '2':$segment = 'Instructor';
                         break;
 
                 }

Hyper-M_Portal/services/common.php

@@ -800,15 +800,11 @@ function accessmentusertype()
         $lang = (isset($_REQUEST["lang"])) ? $_REQUEST["lang"] : 'en_us';
         if (isset($_SESSION["userid"])) {
 
-            $arr[] = array("id" => '0', 'title' => 'Sales Executive(DSE)');
-            $arr[] = array("id" => '1', 'title' => 'International Bike Sales Executive');
-            //$arr[]=array("id"=>'2','title'=>'HO Manager');
-            $arr[] = array("id" => '3', 'title' => 'Zonal Manager');
-            $arr[] = array("id" => '4', 'title' => 'Trainer');
-            $arr[] = array("id" => '5', 'title' => 'Regional Manager');
-            $arr[] = array("id" => '6', 'title' => 'Area Manager');
-            //$arr[]=array("id"=>'7','title'=>'Dealer');
-            //$arr[]=array("id"=>'8','title'=>'Customer Experience');
+            $arr[] = array("id" => '0', 'title' => 'Age Group 7-10');
+            $arr[] = array("id" => '1', 'title' => 'Age Group 10-14');
+            $arr[] = array("id" => '3', 'title' => 'Age Group 14-18');
+            $arr[] = array("id" => '4', 'title' => 'Parents/Guardians');
+            $arr[] = array("id" => '5', 'title' => 'Others');
 
             $conn->message(true, $conn->getMessage($lang, 'common', 'success1'), $arr);
         } else {

Hyper-M_Portal/services/excelupload.php

@@ -97,9 +97,9 @@ function dsedata() {
                     $segment_str =(count($Row)>=10)? strtolower(trim(escape_str($Row[$i++]))):'0';
                     switch($segment_str)
                     {
-                        case 'motorcycle': $segment='1';
+                        case 'Parents/Guardian': $segment='1';
                             break;
-                        case 'scooter':$segment='2';
+                        case 'Instructor':$segment='2';
                             break;
                         default:
                             $segment='0';   

Hyper-M_Portal/services/products.php

@@ -34,7 +34,7 @@ function productlist () {
         $cateid = escape_str($_REQUEST['cateid']);
         
 		if(isset($_SESSION["userid"])) {
-			$query_str = "SELECT SQL_CALC_FOUND_ROWS t.*, CASE WHEN t.segment=0 THEN 'No Segment' WHEN t.segment=1 THEN 'Motorcycle' WHEN t.segment=2 THEN 'Scooter' ELSE 'No Segment' END as segment_str,c.catename FROM ".TABLE_ASSET_TOPIC." t  LEFT JOIN ".TABLE_CATEGORY." c ON t.cateid=c.cateid WHERE t.is_deleted = 0 ";
+			$query_str = "SELECT SQL_CALC_FOUND_ROWS t.*, CASE WHEN t.segment=0 THEN 'Student Learner' WHEN t.segment=1 THEN 'Parents/Guardian' WHEN t.segment=2 THEN 'Instructor' ELSE 'Student Learner' END as segment_str,c.catename FROM ".TABLE_ASSET_TOPIC." t  LEFT JOIN ".TABLE_CATEGORY." c ON t.cateid=c.cateid WHERE t.is_deleted = 0 ";
 
 			// Search
 			if (!empty($key)) {

Hyper-M_Portal/services/report_content_download.php

@@ -281,10 +281,10 @@ function content_report_list_v2() {
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++).$row,$res_user->fname." ".$res_user->lname);
                     switch($res_user->segment)
                     {
-                        case '0':$segment_str='-'; break;
-                        case '1':$segment_str='Motorcycle'; break;
-                        case '2':$segment_str='Scooter'; break;
-                        default:$segment_str='-'; break;
+                        case '0':$segment_str='Student Learner'; break;
+                        case '1':$segment_str='Parents/Guardian'; break;
+                        case '2':$segment_str='Instructor'; break;
+                        default:$segment_str='Student Learner'; break;
                     }
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++).$row,$segment_str);
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++).$row,$res_user->mobileno);                    

Hyper-M_Portal/services/report_enquiry_download.php

@@ -202,11 +202,11 @@ function enquirystatusdseexport()
                     $objPHPExcel->getActiveSheet()->getStyle('H' . $row)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_TEXT); //dealer_code
 
                     switch ($val->segment) {
-                        case '1':$segment_str = 'Motorcycle';
+                        case '1':$segment_str = 'Parents/Guardian';
                             break;
-                        case '2':$segment_str = 'Scooter';
+                        case '2':$segment_str = 'Instructor';
                             break;
-                        default:$segment_str = '-';
+                        default:$segment_str = 'Student Learner';
                             break;
                     }
 
@@ -399,11 +399,11 @@ function enquirytestridedseexport()
                     $objPHPExcel->getActiveSheet()->getStyle('H' . $row)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_TEXT); //dealer_code
 
                     switch ($val->segment) {
-                        case '1':$segment_str = 'Motorcycle';
+                        case '1':$segment_str = 'Parents/Guardian';
                             break;
-                        case '2':$segment_str = 'Scooter';
+                        case '2':$segment_str = 'Instructor';
                             break;
-                        default:$segment_str = '-';
+                        default:$segment_str = 'Student Learner';
                             break;
                     }
 
@@ -574,11 +574,11 @@ function enquiryconversionratiodseexport()
                     $objPHPExcel->getActiveSheet()->getStyle('H' . $row)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_TEXT); //dealer_code
 
                     switch ($val->segment) {
-                        case '1':$segment_str = 'Motorcycle';
+                        case '1':$segment_str = 'Parents/Guardian';
                             break;
-                        case '2':$segment_str = 'Scooter';
+                        case '2':$segment_str = 'Instructor';
                             break;
-                        default:$segment_str = '-';
+                        default:$segment_str = 'Student Learner';
                             break;
                     }
 
@@ -786,11 +786,11 @@ function productivitydseexport()
                     $objPHPExcel->getActiveSheet()->getStyle('H' . $row)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_TEXT); //dealer_code
 
                     switch ($val->segment) {
-                        case '1':$segment_str = 'Motorcycle';
+                        case '1':$segment_str = 'Parents/Guardian';
                             break;
-                        case '2':$segment_str = 'Scooter';
+                        case '2':$segment_str = 'Instructor';
                             break;
-                        default:$segment_str = '-';
+                        default:$segment_str = 'Student Learner';
                             break;
                     }
 
@@ -1109,11 +1109,11 @@ function temp_suspension()
                     $objPHPExcel->getActiveSheet()->getStyle('H' . $row)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_TEXT); //dealer_code
 
                     switch ($val->segment) {
-                        case '1':$segment_str = 'Motorcycle';
+                        case '1':$segment_str = 'Parents/Guardian';
                             break;
-                        case '2':$segment_str = 'Scooter';
+                        case '2':$segment_str = 'Instructor';
                             break;
-                        default:$segment_str = '-';
+                        default:$segment_str = 'Student Learner';
                             break;
                     }
 

Hyper-M_Portal/services/reportdownload.php

@@ -394,11 +394,11 @@ function user_registration()
                     $segment_str = '';
                     switch ($res_user->segment) {
 
-                        case '1':$segment_str = 'Motorcycle';
+                        case '1':$segment_str = 'Parents/Guardian';
                             break;
-                        case '2':$segment_str = 'Scootor';
+                        case '2':$segment_str = 'Instructor';
                             break;
-                        default:$segment_str = '-';
+                        default:$segment_str = 'Student Learner';
                             break;
                     }
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $segment_str);
@@ -544,13 +544,13 @@ function inactive_user_registration()
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->smpin);
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->fname . " " . $res_user->lname);
                     switch ($res_user->segment) {
-                        case '0':$segment_str = '-';
+                        case '0':$segment_str = 'Student Learner';
                             break;
-                        case '1':$segment_str = 'Motorcycle';
+                        case '1':$segment_str = 'Parents/Guardian';
                             break;
-                        case '2':$segment_str = 'Scooter';
+                        case '2':$segment_str = 'Instructor';
                             break;
-                        default:$segment_str = '-';
+                        default:$segment_str = 'Student Learner';
                             break;
                     }
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $segment_str);
@@ -2204,13 +2204,13 @@ function activeinactive_report()
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->smpin);
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->fname . " " . $res_user->lname);
                     switch ($res_user->segment) {
-                        case '0':$segment_str = '-';
+                        case '0':$segment_str = 'Student Learner';
                             break;
-                        case '1':$segment_str = 'Motorcycle';
+                        case '1':$segment_str = 'Parents/Guardian';
                             break;
-                        case '2':$segment_str = 'Scooter';
+                        case '2':$segment_str = 'Instructor';
                             break;
-                        default:$segment_str = '-';
+                        default:$segment_str = 'Student Learner';
                             break;
                     }
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $segment_str);
@@ -2845,9 +2845,9 @@ function user_registration_mail()
                 $segment_str = '';
                 switch ($res_user->segment) {
 
-                    case '1':$segment_str = 'Motorcycle';
+                    case '1':$segment_str = 'Parents/Guardian';
                         break;
-                    case '2':$segment_str = 'Scootor';
+                    case '2':$segment_str = 'Instructor';
                         break;
                 }
                 $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $segment_str);
@@ -2953,9 +2953,9 @@ function emp_activeinactive_mail()
 
                 $segment_str = '-';
                 switch ($res_user->segment) {
-                    case '1':$segment_str = 'Motorcycle';
+                    case '1':$segment_str = 'Parents/Guardian';
                         break;
-                    case '2':$segment_str = 'Scooter';
+                    case '2':$segment_str = 'Instructor';
                         break;
                 }
                 $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $segment_str);
@@ -3848,13 +3848,13 @@ function page_access_v2()
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->smpin);
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->fname . " " . $res_user->lname);
                     switch ($res_user->segment) {
-                        case '0':$segment_str = '-';
+                        case '0':$segment_str = 'Student Learner';
                             break;
-                        case '1':$segment_str = 'Motorcycle';
+                        case '1':$segment_str = 'Parents/Guardian';
                             break;
-                        case '2':$segment_str = 'Scooter';
+                        case '2':$segment_str = 'Instructor';
                             break;
-                        default:$segment_str = '-';
+                        default:$segment_str = 'Student Learner';
                             break;
                     }
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $segment_str);
@@ -4358,13 +4358,13 @@ function points_report_list_v2()
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->smpin);
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->fname . " " . $res_user->lname);
                     switch ($res_user->segment) {
-                        case '0':$segment_str = '-';
+                        case '0':$segment_str = 'Student Learner';
                             break;
-                        case '1':$segment_str = 'Motorcycle';
+                        case '1':$segment_str = 'Parents/Guardian';
                             break;
-                        case '2':$segment_str = 'Scooter';
+                        case '2':$segment_str = 'Instructor';
                             break;
-                        default:$segment_str = '-';
+                        default:$segment_str = 'Student Learner';
                             break;
                     }
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $segment_str);
@@ -4800,13 +4800,13 @@ function sales_report_list_v2()
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->smpin);
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->fname . " " . $res_user->lname);
                     switch ($res_user->segment) {
-                        case '0':$segment_str = '-';
+                        case '0':$segment_str = 'Student Learner';
                             break;
-                        case '1':$segment_str = 'Motorcycle';
+                        case '1':$segment_str = 'Parents/Guardian';
                             break;
-                        case '2':$segment_str = 'Scooter';
+                        case '2':$segment_str = 'Instructor';
                             break;
-                        default:$segment_str = '-';
+                        default:$segment_str = 'Student Learner';
                             break;
                     }
 
@@ -5260,13 +5260,13 @@ function certification_report_list_v2()
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->smpin);
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->fname . " " . $res_user->lname);
                     switch ($res_user->segment) {
-                        case '0':$segment_str = '-';
+                        case '0':$segment_str = 'Student Learner';
                             break;
-                        case '1':$segment_str = 'Motorcycle';
+                        case '1':$segment_str = 'Parents/Guardian';
                             break;
-                        case '2':$segment_str = 'Scooter';
+                        case '2':$segment_str = 'Instructor';
                             break;
-                        default:$segment_str = '-';
+                        default:$segment_str = 'Student Learner';
                             break;
                     }
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $segment_str);
@@ -6147,13 +6147,13 @@ function assessment_report_list_v2()
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->smpin);
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->fname . " " . $res_user->lname);
                     switch ($res_user->segment) {
-                        case '0':$segment_str = '-';
+                        case '0':$segment_str = 'Student Learner';
                             break;
-                        case '1':$segment_str = 'Motorcycle';
+                        case '1':$segment_str = 'Parents/Guardian';
                             break;
-                        case '2':$segment_str = 'Scooter';
+                        case '2':$segment_str = 'Instructor';
                             break;
-                        default:$segment_str = '-';
+                        default:$segment_str = 'Student Learner';
                             break;
                     }
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $segment_str);
@@ -6643,11 +6643,11 @@ function setsalestarget_report_list_v2()
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->fname . " " . $res_user->lname);
                     $segment_str = '-';
                     switch ($res_user->segment) {
-                        case '1':$segment_str = 'Motorcycle';
+                        case '1':$segment_str = 'Parents/Guardian';
                             break;
-                        case '2':$segment_str = 'Scooter';
+                        case '2':$segment_str = 'Instructor';
                             break;
-                        default:$segment_str = '-';
+                        default:$segment_str = 'Student Learner';
                             break;
                     }
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $segment_str);
@@ -7397,13 +7397,13 @@ function useraccess_data()
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->smpin);
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $res_user->fname . " " . $res_user->lname);
                     switch ($res_user->segment) {
-                        case '0':$segment_str = '-';
+                        case '0':$segment_str = 'Student Learner';
                             break;
-                        case '1':$segment_str = 'Motorcycle';
+                        case '1':$segment_str = 'Parents/Guardian';
                             break;
-                        case '2':$segment_str = 'Scooter';
+                        case '2':$segment_str = 'Instructor';
                             break;
-                        default:$segment_str = '-';
+                        default:$segment_str = 'Student Learner';
                             break;
                     }
                     $objPHPExcel->getActiveSheet()->SetCellValue(getColumnFromNumber($i++) . $row, $segment_str);
@@ -7755,11 +7755,11 @@ function rewardpoint_data()
             $segment_str = '';
             switch ($smpin_data[0]->segment) {
 
-                case '1':$segment_str = 'Motorcycle';
-                    break;
-                case '2':$segment_str = 'Scootor';
-                    break;
-                default:$segment_str = '-';
+                    case '1':$segment_str = 'Parents/Guardian';
+                        break;
+                    case '2':$segment_str = 'Instructor';
+                        break;
+                    default:$segment_str = 'Student Learner';
                     break;
             }
             $row++;