Merge pull request #49 from archan0621/stage

4월 2주차 스프린트 배포
archan0621 · Apr 18, 2024 · cf1a7ac · cf1a7ac
2 parents 010ec89 + 1c38ac5
commit cf1a7ac
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 48 deletions.
diff --git a/admin_management/index.php b/admin_management/index.php
@@ -1,47 +1,44 @@
 <?php
-    include '../tpl/body_tpl.php';
-    function html_body() {
-        global $_SESSION, $my_api, $is_maintenance;
-        if ($is_maintenance) {
-            header('Location: /maintenance');
-        }
-        if (!isset($_SESSION['token']) || $_SESSION['userRole'] != 'ADMIN') {
-            header('Location: /');
-        }
-
-        require $_SERVER['DOCUMENT_ROOT'].'/model/JwtApiCall.php';
-        $get_member_list = JwtApiCall($my_api."member/memberList", "POST", array(''), $_SESSION['token']);
+include '../tpl/body_tpl.php';
+function html_body() {
+    global $_SESSION, $my_api;
+    if (!isset($_SESSION['token']) || $_SESSION['userRole'] != 'ADMIN') {
+        header('Location: /');
+    }
+
+    require $_SERVER['DOCUMENT_ROOT'].'/model/JwtApiCall.php';
+    $get_member_list = JwtApiCall($my_api."member/memberList", "POST", array(''), $_SESSION['token']);
 
-        $gender = '';
-        if (isset($_GET['gender'])) {
-            if ($_GET['gender'] == 'male') {
-                $gender = 'male';
-            } else if ($_GET['gender'] == 'female') {
-                $gender = 'female';
-            } else {
-                $gender = '';
-            }
+    $gender = '';
+    if (isset($_GET['gender'])) {
+        if ($_GET['gender'] == 'male') {
+            $gender = 'male';
+        } else if ($_GET['gender'] == 'female') {
+            $gender = 'female';
+        } else {
+            $gender = '';
         }
+    }
 
-        $male_list = [];
-        $female_list = [];
-        foreach ($get_member_list['memberList'] as $item) {
-            if ($item['gender'] == 'MALE') {
-                array_push($male_list, $item);
-            } else {
-                array_push($female_list, $item);
-            }
+    $male_list = [];
+    $female_list = [];
+    foreach ($get_member_list['memberList'] as $item) {
+        if ($item['gender'] == 'MALE') {
+            array_push($male_list, $item);
+        } else {
+            array_push($female_list, $item);
         }
+    }
 
-        function comparePlayers($player1, $player2) {
-            $sortA = $player1['name'];
-            $sortB = $player2['name'];
+    function comparePlayers($player1, $player2) {
+        $sortA = $player1['name'];
+        $sortB = $player2['name'];
 
-            return strcmp($sortA, $sortB);
-        }
-    
-        usort($male_list, 'comparePlayers');
-        usort($female_list, 'comparePlayers');
+        return strcmp($sortA, $sortB);
+    }
+
+    usort($male_list, 'comparePlayers');
+    usort($female_list, 'comparePlayers');
 ?>
 <div class="page_wrap">
     <div class="bg_white page">
@@ -59,7 +56,7 @@ function comparePlayers($player1, $player2) {
                 </div>
             </div>
             <div class="search_member_wrap">
-                <input type="text" name="search_member" id="search_member" class="search_member" placeholder="이름을 입력해주세요">
+                <input type="text" name="search_member" onkeyup="filter()" id="search_member" class="search_member" placeholder="이름을 입력해주세요">
                 <p class="icon"><i class='fa-solid fa-magnifying-glass'></i></p>
             </div>
         </div>
@@ -82,15 +79,15 @@ function comparePlayers($player1, $player2) {
                             <div class="member_list">
                                 <?php if ($gender == '' || $gender == 'male') { ?>
                                     <?php foreach ($male_list as $item) { ?>
-                                    <div><p><?=$item['name']?></p><p>남자</p><p><?=$item['warnPoint']?>회</p><p><a href="member_detail?id=<?=$item['id']?>">자세히</a></p></div>
+                                    <div class="listInner"><p class="searchName"><?=$item['name']?></p><p>남자</p><p><?=$item['warnPoint']?>회</p><p><a href="member_detail?id=<?=$item['id']?>">자세히</a></p></div>
                                     <?php } ?>
                                 <?php } ?>
                                 <?php if ($gender == '') { ?>
                                 <p class="line"></p>
                                 <?php } ?>
                                 <?php if ($gender == '' || $gender == 'female') { ?>
                                     <?php foreach ($female_list as $item) { ?>
-                                    <div><p><?=$item['name']?></p><p>여자</p><p><?=$item['warnPoint']?>회</p><p><a href="member_detail?id=<?=$item['id']?>">자세히</a></p></div>
+                                    <div class="listInner"><p class="searchName"><?=$item['name']?></p><p>여자</p><p><?=$item['warnPoint']?>회</p><p><a href="member_detail?id=<?=$item['id']?>">자세히</a></p></div>
                                     <?php } ?>
                                 <?php } ?>
                             </div>
@@ -105,7 +102,22 @@ function comparePlayers($player1, $player2) {
     function no_function() {
         alert('공사 중입니다!');
     }
+
+    function filter() {
+        console.log("yeh");
+        let search = document.getElementById("search_member").value.toLocaleLowerCase();
+        let listInner = document.getElementsByClassName("listInner");
+
+        for (let i = 0; i < listInner.length; i++) {
+          let name = listInner[i].getElementsByClassName("searchName")[0];
+          if (name && name.innerHTML.toLocaleLowerCase().indexOf(search) !== -1) {
+            listInner[i].style.display = "flex"
+          } else {
+            listInner[i].style.display = "none"
+          }
+        }
+      }
 </script>
 <?php
     }
-?>
+?>
diff --git a/admin_management/member_detail.php b/admin_management/member_detail.php
@@ -12,6 +12,9 @@ function html_body() {
 
         $memberId = $_GET['id'];
         $get_member_detail = JwtApiCall($my_api."member/memberDetail", "POST", array('memberId' => $memberId), $_SESSION['token']);
+        $warnPoint = $get_member_detail['memberInfo']['warnPoint'];
+        $warnings = intdiv($warnPoint, 3); // warnPoint를 3으로 나눈 몫을 구함 (경고 횟수)
+        $cautions = $warnPoint % 3; // warnPoint를 3으로 나눈 나머지를 구함 (주의 횟수)
 ?>
 <div class="page_wrap">
     <div class="bg_white page">
@@ -42,9 +45,9 @@ function html_body() {
                                 <p class="phone">TEL <?=$get_member_detail['memberInfo']['phone']?></p>
                             </div>
                             <div class="warn_point_wrap">
-                                <div class="warn_point warn_point_1"><p><?=$get_member_detail['memberInfo']['warnPoint']?></p><p class="warn_point_title">경고</p></div>
+                                <div class="warn_point warn_point_1"><p><?=$warnings?></p><p class="warn_point_title">경고</p></div>
                                 <div class="line"></div>
-                                <div class="warn_point warn_point_2"><p>0</p><p class="warn_point_title">주의</p></div>
+                                <div class="warn_point warn_point_2"><p><?=$cautions?></p><p class="warn_point_title">주의</p></div>
                             </div>
                         </div>
                     </div>
@@ -118,7 +121,7 @@ function html_body() {
             <div class="rule_main">
                 <p>1. 투표 미참여 <span class="warn_1">주의 1회</span></p>
                 <p>2. 20분 이상 경기 지각 시 <span class="warn_1">주의 1회</span></p>
-                <p>3. 명단 확정 후 불참 통보/노쇼 시 <span class="warn_1">주의 1회</span></p>
+                <p>3. 명단 확정 후 불참 통보/노쇼 시 <span class="warn_1">경고 1회</span></p>
                 <p>4. 경기 3번 연속 미참여 <span class="warn_2">경고 1회</span></p>
             </div>
         </div>

diff --git a/tpl/body_tpl.php b/tpl/body_tpl.php
@@ -1,5 +1,5 @@
 <?php
-    $_SERVER['REQUEST_URI'] == "/" ? require 'config/config.php' : require '../config/config.php';
+    $_SERVER['REQUEST_URI'] == "/" || $_SERVER['REQUEST_URI'] == "/maintenance"  ? require 'config/config.php' : require '../config/config.php';
     global $_SESSION;
 ?>
 <!DOCTYPE html>

diff --git a/view/my_info.php b/view/my_info.php
@@ -11,6 +11,10 @@ function html_body() {
         require $_SERVER['DOCUMENT_ROOT'].'/model/JwtApiCall.php';
 
         $get_member_detail = JwtApiCall($my_api."member/memberDetail", "POST", array('memberId' => $_SESSION['userId']), $_SESSION['token']);
+
+        $warnPoint = $get_member_detail['memberInfo']['warnPoint'];
+        $warnings = intdiv($warnPoint, 3); // warnPoint를 3으로 나눈 몫을 구함 (경고 횟수)
+        $cautions = $warnPoint % 3; // warnPoint를 3으로 나눈 나머지를 구함 (주의 횟수)
 ?>
 <div class="page_wrap">
     <div class="bg_white page">
@@ -41,9 +45,9 @@ function html_body() {
                                 <p class="phone">TEL <?=$get_member_detail['memberInfo']['phone']?></p>
                             </div>
                             <div class="warn_point_wrap">
-                                <div class="warn_point warn_point_1"><p><?=$get_member_detail['memberInfo']['warnPoint']?></p><p class="warn_point_title">경고</p></div>
+                                <div class="warn_point warn_point_1"><p><?=$warnings?></p><p class="warn_point_title">경고</p></div>
                                 <div class="line"></div>
-                                <div class="warn_point warn_point_2"><p>0</p><p class="warn_point_title">주의</p></div>
+                                <div class="warn_point warn_point_2"><p><?=$cautions?></p><p class="warn_point_title">주의</p></div>
                             </div>
                         </div>
                     </div>
@@ -116,7 +120,7 @@ function html_body() {
             <div class="rule_main">
                 <p>1. 투표 미참여 <span class="warn_1">주의 1회</span></p>
                 <p>2. 20분 이상 경기 지각 시 <span class="warn_1">주의 1회</span></p>
-                <p>3. 명단 확정 후 불참 통보/노쇼 시 <span class="warn_1">주의 1회</span></p>
+                <p>3. 명단 확정 후 불참 통보/노쇼 시 <span class="warn_1">경고 1회</span></p>
                 <p>4. 경기 3번 연속 미참여 <span class="warn_2">경고 1회</span></p>
             </div>
         </div>