diff --git a/src/web/module/maestro_section_record.html b/src/web/module/maestro_section_record.html index 355fd7d..5baaeb3 100644 --- a/src/web/module/maestro_section_record.html +++ b/src/web/module/maestro_section_record.html @@ -253,10 +253,11 @@ function getPlayerRecordList(limitCount) { } var requestURL = ""; + if(appID == 3000) - requestURL = "./../server/record/request_app_player_record_list.php"; - else requestURL = "./../server/record/request_license_timer_player_record_list.php"; + else + requestURL = "./../server/record/request_app_player_record_list.php"; sendRequestServer( //url, sendParams, onSuccess, onFail, isDebugMode); requestURL, diff --git a/src/web/server/record/request_app_player_record_list.php b/src/web/server/record/request_app_player_record_list.php index 9731f25..a254012 100644 --- a/src/web/server/record/request_app_player_record_list.php +++ b/src/web/server/record/request_app_player_record_list.php @@ -46,8 +46,8 @@ exit; function makeDateStatement($start_date, $end_date) { - // return " '".$start_date."' < RecordDateTime AND RecordDateTime < '".$end_date."'"; - return " '2017-01-01' < RecordDateTime AND RecordDateTime < '".$end_date."'"; + // return " '".$start_date."' < BR.RecordDateTime AND BR.RecordDateTime < '".$end_date."'"; + return " '2017-01-01' < BR.RecordDateTime AND BR.RecordDateTime < '".$end_date."'"; } function makeSubjectSentence($app_id) { @@ -110,7 +110,6 @@ function make_where_statement($date_statement, $player_name_statement, $subject_ $where_statement = $where_statement." AND "; $where_statement = $where_statement.$subject_statement; - // echo $where_statement."\n\n"; return $where_statement; } @@ -192,9 +191,7 @@ function get_player_record_list($maestro_id, $where_statement, $limit_count) { $record_date['Record'] = $record; array_push($record_array, $record_date); } - // $return_array['RecordList'] = $record_array; - // return $return_array; return $record_array; } diff --git a/src/web/server/record/request_license_timer_player_record_list.php b/src/web/server/record/request_license_timer_player_record_list.php index 9731f25..8fd6dc9 100644 --- a/src/web/server/record/request_license_timer_player_record_list.php +++ b/src/web/server/record/request_license_timer_player_record_list.php @@ -46,13 +46,15 @@ exit; function makeDateStatement($start_date, $end_date) { - // return " '".$start_date."' < RecordDateTime AND RecordDateTime < '".$end_date."'"; - return " '2017-01-01' < RecordDateTime AND RecordDateTime < '".$end_date."'"; + // return " '".$start_date."' < LS.ScoreDateTime AND LS.ScoreDateTime < '".$end_date."'"; + return " '2017-01-01' < LS.ScoreDateTime AND LS.ScoreDateTime < '".$end_date."'"; } function makeSubjectSentence($app_id) { if($app_id == 0) return ""; + else if($app_id == 3000) + return ""; $subject_statement = ""; if(is_subject_bundle_item($app_id)) { @@ -77,11 +79,11 @@ function makeSubjectSentence($app_id) { $subject_statement = $subject_statement."A.AppID = ".$app_id; } - return $subject_statement." AND BR.AppID = A.AppID"; + return $subject_statement." AND LS.AppID = A.AppID"; } function makePlayerNameStatement($player_name_list) { - $player_name_statement = "BR.PlayerID = P.PlayerID"; + $player_name_statement = "LS.PlayerID = P.PlayerID"; if(strlen($player_name_list) > 0) $player_name_statement = $player_name_statement." AND P.Name LIKE '%".$player_name_list."%'"; @@ -110,7 +112,6 @@ function make_where_statement($date_statement, $player_name_statement, $subject_ $where_statement = $where_statement." AND "; $where_statement = $where_statement.$subject_statement; - // echo $where_statement."\n\n"; return $where_statement; } @@ -119,8 +120,8 @@ function get_player_record_count($maestro_id, $where_statement, $limit_count) { $query = " SELECT COUNT(*) - FROM best_record BR, player P, App A - WHERE BR.MaestroID = ? AND ".$where_statement." + FROM license_score LS, player P + WHERE LS.MaestroID = ? AND ".$where_statement." "; if($limit_count > 0) @@ -144,8 +145,8 @@ function get_player_record_total_count($maestro_id, $where_statement) { $query = " SELECT COUNT(*) - FROM best_record BR, player P, App A - WHERE BR.MaestroID = ? AND ".$where_statement." + FROM license_score LS, player P + WHERE LS.MaestroID = ? AND ".$where_statement." "; // echo $query; @@ -165,11 +166,11 @@ function get_player_record_list($maestro_id, $where_statement, $limit_count) { global $db_conn; $query = " - SELECT DATE(BR.RecordDateTime) AS Date, TIME(BR.RecordDateTime) AS Time, - P.Name AS Name, A.KoreanName AS Subject, BR.BestRecord AS Record - FROM best_record BR, player P, App A - WHERE BR.MaestroID = ? AND ".$where_statement." - ORDER BY BR.RecordDateTime ASC + SELECT DATE(LS.ScoreDateTime) AS Date, TIME(LS.ScoreDateTime) AS Time, + P.Name AS Name, LS.SubjectName AS Subject, LS.Score AS Record + FROM license_score LS, player P + WHERE LS.MaestroID = ? AND ".$where_statement." + ORDER BY LS.ScoreDateTime ASC "; if($limit_count > 0) @@ -192,9 +193,7 @@ function get_player_record_list($maestro_id, $where_statement, $limit_count) { $record_date['Record'] = $record; array_push($record_array, $record_date); } - // $return_array['RecordList'] = $record_array; - // return $return_array; return $record_array; }