pr

src/controllers/employeeController.js

@@ -1,7 +1,9 @@
 const Employee = require('../models/Employee')
 const mongoose = require('mongoose');
 const Career = require('../models/Career')
-const calculateAge = require('../utils/calcAge')
+const calculateAge = require('../utils/calcAge');
+const { worksite } = require('./worksiteController');
+const moment = require('moment')
 
 
 /**
@@ -95,7 +97,12 @@ exports.postEmployee = async (req, res) => {
 
     try{
       const employee = await Employee.findOne({ _id: req.params.id })
-
+      const careers = await Career.find({employee: employee._id}).populate('worksite')
+      // console.log(careers)
+      careers.forEach(career => {
+        // console.log("career detail : ", career.worksite)
+      })
+
       const locals = {
         title: "View Employee Data",
         description: "Free NodeJs User Management System",
@@ -106,6 +113,8 @@ exports.postEmployee = async (req, res) => {
         locals,
         employee,
         calculateAge,
+        careers,
+        moment
       })
     } catch(error) {
       console.log(error);
@@ -222,4 +231,16 @@ exports.postEmployee = async (req, res) => {
           } catch (error) {
             console.log(error);
           }
-        };
+        };
+
+exports.putReview = async (req, res) => {
+  console.log('/put review')
+
+  const { eid, cid } = req.params;
+
+  await Career.findByIdAndUpdate(cid, {review: req.body.review})
+
+  const updated = await Career.findById(cid)
+  console.log(updated.review)
+  res.redirect(`/view/${eid}`)
+}

src/routes/employee.js

@@ -8,6 +8,7 @@ router.get('/employee', isLoggedIn, employeeController.employee);
 router.get('/addemployee', isLoggedIn, employeeController.addEmployee);
 router.post('/addemployee', isLoggedIn, employeeController.postEmployee);
 router.get('/view/:id', isLoggedIn, employeeController.viewEmployee);
+router.put('/view/:eid/putreview/:cid', isLoggedIn, employeeController.putReview)
 
 router.get('/edit/:id', isLoggedIn, employeeController.editEmployee);
 router.put('/edit/:id', isLoggedIn, employeeController.editPostemployee);

src/routes/worksite.js

@@ -2,7 +2,11 @@ const express = require('express');
 const router = express.Router();
 const { isLoggedIn } = require('../middleware/checkAuth');
 const worksiteController = require('../controllers/worksiteController');
+const smsController = require('../controllers/smsController')
 
+router.get('/python', smsController.parseMessage);
+router.get('/sms', smsController.getsms);
+router.post('/sms', smsController.parseMessage);
 router.get('/worksite', isLoggedIn, worksiteController.worksite);
 router.get('/worksite/add', isLoggedIn, worksiteController.addWorksite);
 router.post('/worksite/post', isLoggedIn, worksiteController.postWorksite);

src/views/employee/viewemployee.ejs

@@ -1,3 +1,38 @@
+<% careers.forEach(career => { %>
+<div class="modal fade" id="modal<%= career._id %>" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered modal-dialog-scrollable modal-md">
+        <div class="modal-content">
+            <div class="modal-header">
+            <h1 class="modal-title fs-5" id="exampleModalLabel">근무자 리뷰</h1>
+            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <form action="/view/<%= career.employee._id %>/putreview/<%= career._id %>?_method=PUT" method="POST">
+                <div class="modal-body">
+                    <div class="container-fluid">
+                        <div class="card-group pb-5">
+                            <div class="card">
+                            <div class="card-body mb-4">
+                                <h5 class="card-title">현장 평가 내용</h5>
+                                <textarea class="form-control h-100" aria-label="With textarea" id="review" name="review" ><%= career.review %></textarea>
+                            </div>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+                <div class="modal-footer">
+                <button type="button" class="btn btn-outline-secondary" onclick="location.href='/worksite/<%= career.worksite._id %>'" data-bs-dismiss="modal">현장 바로가기</button>
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+                <button type="submit" class="btn btn-primary" >수정하기</button>
+            </form>
+            </div>
+        </div>
+    </div>
+</div>
+<% }); %>
+
+
+
 <div class="d-flex justify-content-between flex-wrap flex-md nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
     <h3 class="h2"><%= employee.name  %></h3>
 
@@ -79,4 +114,45 @@
             <div class="col"><%= employee.updatedAt%></div>
         </div>
     </li>
-</ul>
+</ul>
+
+<div class="d-flex justify-content-between flex-wrap flex-md nowrap align-items-center pb-2 pt-3 mb-3 border-bottom">
+    <h3 class="h3">근무기록</h3>
+</div>
+
+<div class="container-fluid" style="max-height:70%;">
+    <div class="table-responsive">
+        <table class="table table-hover">
+            <thead>
+                <tr>
+                    <th scope="col">현장명</th>
+                    <th scope="col">주소</th>
+                    <th scope="col">소재지</th>
+                    <th scope="col">급여</th>
+                    <th scope="col">업무</th>
+                    <th scope="col">날짜</th>
+                    <th scope="col">근무시간</th>
+                </tr>
+            </thead>
+            <tbody>
+                <% careers.forEach(career => { %>
+                <tr class="align-middle" style="height: 60px;" data-bs-toggle="modal" data-bs-target="#modal<%= career._id %>">
+                    <td><%= career.worksite.name %></td>
+                    <td><%= career.worksite.address %></td>
+                    <td><%= career.worksite.local %></td>
+                    <td><%= career.worksite.salary %>원</td>
+                    <td><%= career.worksite.worktype %></td>
+                    <td><%= moment(career.worksite.date).format("YYYY년 MMMM Do a hh:mm") %></td>
+                    <td><%= moment(career.worksite.end).diff(career.worksite.date, 'hour') %>시간</td>
+                </tr>
+                <% }) %>
+            </tbody>
+        </table>
+    </div>
+</div>
+
+<script>
+    function onmodal() {
+        $(`modal${career._id}`).modal('show');
+    };
+</script>