From 9cc467cc3ca17361893acbf0dba0e6d834e83267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Wed, 5 Jun 2019 14:50:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E8=A1=A8=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=93=E5=88=A9=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gys_system/models/groupinfo_model.php |  2 +-
 gys_system/views/feedback_detail.php  | 46 +++++++++++++++++++--------
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/gys_system/models/groupinfo_model.php b/gys_system/models/groupinfo_model.php
index 59493a9b..eaa59bec 100644
--- a/gys_system/models/groupinfo_model.php
+++ b/gys_system/models/groupinfo_model.php
@@ -204,7 +204,7 @@ class Groupinfo_model extends CI_Model {
                        ESI_LeaveCity,
                        ESI_ServiceCity,
                        ESI_ServiceType,
-                       ESI_ServiceSN,
+                       IsNull(ESI_ServiceSN,0) as ESI_ServiceSN,
                        ESI_ServiceSN2,
                        ESI_ServiceName,
                        ESI_Describe,
diff --git a/gys_system/views/feedback_detail.php b/gys_system/views/feedback_detail.php
index b39593e0..31aae60a 100644
--- a/gys_system/views/feedback_detail.php
+++ b/gys_system/views/feedback_detail.php
@@ -31,6 +31,7 @@
                     $guide_rate_index = 0;
                     foreach ($service_item_info as $key => $item) {
                         $count_rate_index++;
+						//echo $item->ESI_Rate. ' ';
                         $count_rate = $count_rate + $item->ESI_Rate;
                         if ($item->ESI_ServiceType == 'W') {
                             $guide_rate_index++;
@@ -118,7 +119,7 @@
                                 ?>
                                 <tr>
                                     <td><?php echo empty($item->ESI_Describe)?$item->ESI_ServiceName:$item->ESI_Describe; ?></td>
-                                    <td><label><input type='radio' value="5" <?php if ($item->ESI_Rate == 5 || empty($item->ESI_Rate)) { echo "checked"; } ?>  name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Excellent</label></td>
+                                    <td><label><input type='radio' value="5" <?php if ($item->ESI_Rate == 5 || empty($item->ESI_Rate) || $item->ESI_Rate==0.00) { echo "checked"; } ?>  name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Excellent</label></td>
                                     <td><label><input type='radio' value="4" <?php if ($item->ESI_Rate == 4) { echo "checked"; } ?> name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Very Good</label></td>
                                     <td><label><input type='radio' value="3" <?php if ($item->ESI_Rate == 3) { echo "checked"; } ?> name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Fair</label></td>
                                     <td><label><input type='radio' value="2" <?php if ($item->ESI_Rate == 2) { echo "checked"; } ?> name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Poor</label></td>
@@ -139,7 +140,7 @@
                                 ?>
                                 <tr>
                                     <td><?php echo empty($item->ESI_Describe)?$item->ESI_ServiceName:$item->ESI_Describe; ?></td>
-                                    <td><label><input type='radio' value="5" <?php if ($item->ESI_Rate == 5 || empty($item->ESI_Rate)) { echo "checked"; } ?>  name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Excellent</label></td>
+                                    <td><label><input type='radio' value="5" <?php if ($item->ESI_Rate == 5 || empty($item->ESI_Rate) || $item->ESI_Rate==0.00) { echo "checked"; } ?>  name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Excellent</label></td>
                                     <td><label><input type='radio' value="4" <?php if ($item->ESI_Rate == 4) { echo "checked"; } ?> name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Very Good</label></td>
                                     <td><label><input type='radio' value="3" <?php if ($item->ESI_Rate == 3) { echo "checked"; } ?> name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Fair</label></td>
                                     <td><label><input type='radio' value="2" <?php if ($item->ESI_Rate == 2) { echo "checked"; } ?> name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Poor</label></td>
@@ -155,11 +156,11 @@
                         </tr>
                         <?php
                         foreach ($service_item_info as $item) {
-                            if ($item->ESI_ServiceType == 'A' || $item->ESI_ServiceType == 'C' || $item->ESI_ServiceType == '7') {
+                            if ($item->ESI_ServiceType == 'A' || $item->ESI_ServiceType == 'C' || ($item->ESI_ServiceType == '7' && $item->ESI_ServiceSN==0)) {
                                 ?>
                                 <tr>
                                     <td><?php echo empty($item->ESI_Describe)?$item->ESI_ServiceName:$item->ESI_Describe; ?></td>
-                                    <td><label><input type='radio' value="5" <?php if ($item->ESI_Rate == 5 || empty($item->ESI_Rate)) { echo "checked"; } ?>  name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Excellent</label></td>
+                                    <td><label><input type='radio' value="5" <?php if ($item->ESI_Rate == 5 || empty($item->ESI_Rate) || $item->ESI_Rate==0.00) { echo "checked"; } ?>  name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>' >Excellent</label></td>
                                     <td><label><input type='radio' value="4" <?php if ($item->ESI_Rate == 4) { echo "checked"; } ?> name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Very Good</label></td>
                                     <td><label><input type='radio' value="3" <?php if ($item->ESI_Rate == 3) { echo "checked"; } ?> name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Fair</label></td>
                                     <td><label><input type='radio' value="2" <?php if ($item->ESI_Rate == 2) { echo "checked"; } ?> name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Poor</label></td>
@@ -169,7 +170,26 @@
                             }
                         }
                         ?>
-
+					 <tr>
+                            <td colspan="6"><h3>4. Our Spotlight Experience(s)</h3></td>
+                        </tr>
+                        <?php
+                        foreach ($service_item_info as $item) {
+                            if ( $item->ESI_ServiceType == '7' && $item->ESI_ServiceSN>0) {
+                                ?>
+                                <tr>
+                                    <td><?php echo empty($item->ESI_Describe)?$item->ESI_ServiceName:$item->ESI_Describe; ?></td>
+                                    <td><label><input type='radio' value="5" <?php if ($item->ESI_Rate == 5 || empty($item->ESI_Rate) || $item->ESI_Rate==0.00) { echo "checked"; } ?>  name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>' >Excellent</label></td>
+                                    <td><label><input type='radio' value="4" <?php if ($item->ESI_Rate == 4) { echo "checked"; } ?> name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Very Good</label></td>
+                                    <td><label><input type='radio' value="3" <?php if ($item->ESI_Rate == 3) { echo "checked"; } ?> name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Fair</label></td>
+                                    <td><label><input type='radio' value="2" <?php if ($item->ESI_Rate == 2) { echo "checked"; } ?> name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Poor</label></td>
+                                    <td><label><input type='radio' value="1" <?php if ($item->ESI_Rate == 1) { echo "checked"; } ?> name='<?php echo 'esi_sn_' . $item->ESI_SN; ?>'>Unacceptable</label></td>
+                                </tr>
+                                <?php
+                            }
+                        }
+                        ?>
+                        
                     </table>
                 </div>
 
@@ -181,7 +201,7 @@
                             switch ($group_service->QSFour) {
                                 case 223005:
                                     ?>
-                                    <h3>4. What do you think of  #<?php echo $group_service->QSFourServiceName; ?>#?</h3>
+                                    <h3>5. What do you think of  #<?php echo $group_service->QSFourServiceName; ?>#?</h3>
                                     <input type="hidden" name="q4_eef_type" value="<?php echo $group_service->QSFour; ?>" />      
                                     <div class="row">
                                         <div class="col-md-24">
@@ -192,7 +212,7 @@
                                     break;
                                 case 223006:
                                     ?>
-                                    <h3>4.What were the most enjoyable or memorable parts of your trip?</h3>
+                                    <h3>5.What were the most enjoyable or memorable parts of your trip?</h3>
                                     <input type="hidden" name="q4_eef_type" value="<?php echo $group_service->QSFour; ?>" />      
                                     <div class="row">
                                         <div class="col-md-24">
@@ -203,7 +223,7 @@
                                     break;
                                 case 223007:
                                     ?>
-                                    <h3>4.If you could take your trip again, what would you do differently?</h3>
+                                    <h3>5.If you could take your trip again, what would you do differently?</h3>
                                     <input type="hidden" name="q4_eef_type" value="<?php echo $group_service->QSFour; ?>" />  
                                     <div class="row">
                                         <div class="col-md-24">
@@ -225,7 +245,7 @@
                     switch ($group_service->QSFive) {
                         case 223008:
                             ?>
-                            <h3>5. Did you recommend #<?php echo $group_service->QSFiveServiceName; ?>#?</h3>
+                            <h3>6. Did you recommend #<?php echo $group_service->QSFiveServiceName; ?>#?</h3>
                             <div class="row">
                                 <input type="hidden" name="q5_eef_type" value="<?php echo $group_service->QSFive; ?>" />
                                 <div class="col-md-2"><label><input type='radio' name='q5_eef_content_radio' <?php echo ($QSFive_EEF_ID == 'yes') ? 'checked' : false; ?> value="yes">YES</label></div>
@@ -237,7 +257,7 @@
                             break;
                         case 223009:
                             ?>
-                            <h3>5. Did your guide take you to any shops/factories or tried to influence you to do so?</h3>
+                            <h3>6. Did your guide take you to any shops/factories or tried to influence you to do so?</h3>
 
                             <div class="row">
                                 <input type="hidden" name="q5_eef_type" value="<?php echo $group_service->QSFive; ?>" />
@@ -250,7 +270,7 @@
                             break;
                         case 223010:
                             ?>
-                            <h3>5. Did your tour guide ‘go the extra mile’?</h3>
+                            <h3>6. Did your tour guide ‘go the extra mile’?</h3>
 
                             <div class="row">
                                 <input type="hidden" name="q5_eef_type" value="<?php echo $group_service->QSFive; ?>" />
@@ -263,7 +283,7 @@
                             break;
                         case 223011:
                             ?>
-                            <h3>5. Did your tour guide take our sign/logo when met at the airport?</h3>
+                            <h3>6. Did your tour guide take our sign/logo when met at the airport?</h3>
 
                             <div class="row">
                                 <input type="hidden" name="q5_eef_type" value="<?php echo $group_service->QSFive; ?>" />
@@ -280,7 +300,7 @@
 
                 <div class="row">
                     <div class="col-md-24">
-                        <h3>6. Are you willing to recommend us on Trip Advisor?</h3>
+                        <h3>7. Are you willing to recommend us on Trip Advisor?</h3>
                     </div>
                 </div>