Merge pull request smarty-php#49 from think-ahead/ticket-5294-delete-…

…unnecessary-code-of-the-shift-simulation-function Redmine 5294: シフトシミュレーション機能の削除で不要になったコードを削除する
think-mcunanan · May 19, 2021 · 9aa9839 · 9aa9839
2 parents 8936755 + 350c7f9
commit 9aa9839
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 41 deletions.
diff --git a/app/controllers/components/misc_function.php b/app/controllers/components/misc_function.php
@@ -113,36 +113,9 @@ function CheckStoreServiceInUse(&$controller, $gscode)
     function SearchStaffAssignToStore(&$controller, $param)
     {
 
-        //$criteria['StaffAssignToStore.ASSIGN_YOYAKU'] = 1;
-        //$criteria['StaffAssignToStore.STORECODE'] = $param['storecode'];
-
         $startdate = $param['year'] . "-" . $param['month'] . "-" . "1";
         $enddate = $controller->enddate;
 
-        //$level2aa['OR'] = array('Staff.HIREDATE IS NULL',
-        //                        'Staff.HIREDATE <= ?' => array($enddate));
-        //$level2ab['OR'] = array('Staff.RETIREDATE IS NULL',
-        //                        'Staff.RETIREDATE >= ?' => array($enddate));
-
-        //$level2a['AND'] = array($level2aa, $level2ab);
-        //$level2b = array('Staff.HIREDATE BETWEEN ? AND ?' => array($startdate, $enddate));
-        //$level2c = array('Staff.RETIREDATE BETWEEN ? AND ?' => array($startdate, $enddate));
-
-        //$level['OR'] = array($level2a, $level2b, $level2c);
-
-        //$and_condition = array($level);
-
-        //$criteria_top = array($criteria,
-        //                      $and_condition,
-        //                      'StaffAssignToStore.STAFFCODE <> ?' => array(0),
-        //                      'Staff.DELFLG IS NULL');
-
-        //        //$orderby = array('StaffAssignToStore.STAFFCODE');
-        //        //$orderby = array('IF(Staff.STAFFCODE = 0, 0, IFNULL(StaffAssignToStore.DISPLAY_ORDER, 9999999)),
-        //        //                  Staff.STAFFCODE');
-
-        //$orderby = array('Staff.DISPLAY_ORDER, Staff.STAFFCODE');
-
         $Sql = "SELECT StaffAssignToStore.STORECODE,
                        StaffAssignToStore.STAFFCODE,
                        StaffAssignToStore.KEYNO,
@@ -153,9 +126,6 @@ function SearchStaffAssignToStore(&$controller, $param)
                        Staff.STAFFNAME,
                        Staff.HIREDATE,
                        Staff.RETIREDATE,
-                       Staff.SALARYTYPE,
-                       Staff.SALARYAMOUNT,
-                       Staff.TRAVEL_ALLOWANCE,
                        Staff.DISPLAY_ORDER
                 FROM staff_assign_to_store StaffAssignToStore
                        JOIN staff Staff
@@ -181,10 +151,6 @@ function SearchStaffAssignToStore(&$controller, $param)
             $arrStaff[$i]['StaffAssignToStore']['HIREDATE']   = $arrStaff[$i]['Staff']['HIREDATE'];
             $arrStaff[$i]['StaffAssignToStore']['RETIREDATE'] = $arrStaff[$i]['Staff']['RETIREDATE'];
             //---------------------------------------------------------------------------------------
-            $arrStaff[$i]['StaffAssignToStore']['SALARYTYPE'] = $arrStaff[$i]['Staff']['SALARYTYPE'];
-            $arrStaff[$i]['StaffAssignToStore']['SALARYAMOUNT'] = $arrStaff[$i]['Staff']['SALARYAMOUNT'];
-            $arrStaff[$i]['StaffAssignToStore']['TRAVEL_ALLOWANCE'] = $arrStaff[$i]['Staff']['TRAVEL_ALLOWANCE'];
-            //---------------------------------------------------------------------------------------
             $arrStaff[$i]['StaffAssignToStore']['KANZASHI_ENABLED'] = !is_null($arrStaff[$i]['StaffAssignToStore']['KANZASHI_SALON_POS_ID']);
             if ($arrStaff[$i]['StaffAssignToStore']['KANZASHI_ENABLED']){
                 $arrStaff[$i]['StaffAssignToStore']['KANZASHI_SALON_POS_ID'] = (int)$arrStaff[$i]['StaffAssignToStore']['KANZASHI_SALON_POS_ID'];

diff --git a/app/controllers/servers_controller.php b/app/controllers/servers_controller.php
@@ -1444,9 +1444,6 @@ class ServersController extends WebServicesController
             'RETIREDATE'            => 'xsd:string',
             'STARTTIME'             => 'xsd:string',
             'ENDTIME'               => 'xsd:string',
-            'SALARYTYPE'            => 'xsd:int',
-            'SALARYAMOUNT'          => 'xsd:int',
-            'TRAVEL_ALLOWANCE'      => 'xsd:int',
             'KANZASHI_ENABLED'      => 'xsd:boolean',
             'KANZASHI_SALON_POS_ID' => 'xsd:int',
             'day1'                  => 'xsd:string',
@@ -5281,10 +5278,6 @@ function wsSearchStaffShift($sessionid, $param)
             $arrStaffShift[$i]['HIREDATE']   = $arrStaff[$i]['StaffAssignToStore']['HIREDATE'];
             $arrStaffShift[$i]['RETIREDATE'] = $arrStaff[$i]['StaffAssignToStore']['RETIREDATE'];
             //-----------------------------------------------------------------------------------
-            $arrStaffShift[$i]['SALARYTYPE'] = $arrStaff[$i]['StaffAssignToStore']['SALARYTYPE'];
-            $arrStaffShift[$i]['SALARYAMOUNT'] = $arrStaff[$i]['StaffAssignToStore']['SALARYAMOUNT'];
-            $arrStaffShift[$i]['TRAVEL_ALLOWANCE'] = $arrStaff[$i]['StaffAssignToStore']['TRAVEL_ALLOWANCE'];
-            //-----------------------------------------------------------------------------------
             $arrStaffShift[$i]['KANZASHI_ENABLED'] = $arrStaff[$i]['StaffAssignToStore']['KANZASHI_ENABLED'];
             if ($arrStaffShift[$i]['KANZASHI_ENABLED']){
                 $arrStaffShift[$i]['KANZASHI_SALON_POS_ID'] = $arrStaff[$i]['StaffAssignToStore']['KANZASHI_SALON_POS_ID'];