From 40e56a882d6b457c1178d7ae6feddffca91b76f4 Mon Sep 17 00:00:00 2001 From: Poppy Date: Thu, 23 May 2024 20:21:36 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EA=B7=BC=EB=AC=B4=EC=9E=90=EB=B3=84=20?= =?UTF-8?q?=EA=B7=BC=EB=AC=B4=EA=B8=B0=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EB=B0=8F=20=EB=A6=AC=EB=B7=B0=20=EC=88=98=EC=A0=95=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/employeeController.js | 27 ++++++++-- src/routes/employee.js | 1 + src/routes/worksite.js | 4 ++ src/views/employee/viewemployee.ejs | 77 ++++++++++++++++++++++++++- 4 files changed, 105 insertions(+), 4 deletions(-) diff --git a/src/controllers/employeeController.js b/src/controllers/employeeController.js index 84b073e2e1..c76aa4c8a6 100644 --- a/src/controllers/employeeController.js +++ b/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); } - }; \ No newline at end of file + }; + +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}`) +} \ No newline at end of file diff --git a/src/routes/employee.js b/src/routes/employee.js index 63394909b7..7adc71bc84 100644 --- a/src/routes/employee.js +++ b/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); diff --git a/src/routes/worksite.js b/src/routes/worksite.js index 824561d1b1..0bbe6da93f 100644 --- a/src/routes/worksite.js +++ b/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); diff --git a/src/views/employee/viewemployee.ejs b/src/views/employee/viewemployee.ejs index e4934bd018..855d515ace 100644 --- a/src/views/employee/viewemployee.ejs +++ b/src/views/employee/viewemployee.ejs @@ -1,3 +1,37 @@ +<% careers.forEach(career => { %> + +<% }); %> + + +

<%= employee.name %>

@@ -79,4 +113,45 @@
<%= employee.updatedAt%>
- \ No newline at end of file + + +
+

근무기록

+
+ +
+
+ + + + + + + + + + + + + + <% careers.forEach(career => { %> + + + + + + + + + + <% }) %> + +
현장명주소소재지급여업무날짜근무시간
<%= career.worksite.name %><%= career.worksite.address %><%= career.worksite.local %><%= career.worksite.salary %>원<%= career.worksite.worktype %><%= moment(career.worksite.date).format("YYYY년 MMMM Do a hh:mm") %><%= moment(career.worksite.end).diff(career.worksite.date, 'hour') %>시간
+
+
+ + \ No newline at end of file From c17448656a785a894dd60a55800dbd5cdd6f5651 Mon Sep 17 00:00:00 2001 From: Poppy Date: Thu, 23 May 2024 20:28:07 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=A6=AC=EB=B7=B0=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=AA=A8=EB=8B=AC=EC=97=90=20=ED=98=84=EC=9E=A5=20=EB=B0=94?= =?UTF-8?q?=EB=A1=9C=EA=B0=80=EA=B8=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/employee/viewemployee.ejs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/employee/viewemployee.ejs b/src/views/employee/viewemployee.ejs index 855d515ace..decddba3ca 100644 --- a/src/views/employee/viewemployee.ejs +++ b/src/views/employee/viewemployee.ejs @@ -21,6 +21,7 @@
+