Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User thamindu #31

Open
wants to merge 236 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
236 commits
Select commit Hold shift + click to select a range
3b7387e
ViewinformationSystem
kamadi2000 Jan 2, 2023
778f41d
error correction
kamadi2000 Jan 2, 2023
31a2d26
error correction
kamadi2000 Jan 2, 2023
1a3ca77
last time function
thamindumk Jan 2, 2023
aa43b54
Merge branch 'dev' into user-thamindu
thamindumk Jan 2, 2023
bac0f5c
Merge pull request #21 from kamadi2000/user-thamindu
thamindumk Jan 2, 2023
b03d818
error correction
thamindumk Jan 2, 2023
d3b5237
error correction
thamindumk Jan 2, 2023
ffe8e26
Merge branch 'employee-form-kamadi' into dev
kamadi2000 Jan 2, 2023
5edccb7
veiw leave status
thamindumk Jan 2, 2023
00f4805
Merge pull request #22 from kamadi2000/user-thamindu
thamindumk Jan 2, 2023
9bfa0f4
change get request to post request in addEmployee
yasira2000 Jan 3, 2023
af28865
add yarn.lock to .gitignore
yasira2000 Jan 3, 2023
936018e
set non action time to token
thamindumk Jan 3, 2023
59854be
Merge pull request #23 from kamadi2000/user-thamindu
thamindumk Jan 3, 2023
bee4f2d
add employee method
yasira2000 Jan 3, 2023
8551e4f
add employee method to user model
yasira2000 Jan 3, 2023
b7baf47
Merge pull request #24 from kamadi2000/yasira-routes
yasira2000 Jan 3, 2023
e31d2ea
try to connect
thamindumk Jan 3, 2023
7e3b5cb
Merge branch 'dev' into user-thamindu
thamindumk Jan 3, 2023
c601668
Merge pull request #25 from kamadi2000/user-thamindu
thamindumk Jan 3, 2023
aa75a0d
error correction in UserModel
thamindumk Jan 3, 2023
34f0330
pageRoutesFile changes
kamadi2000 Jan 3, 2023
fcddffe
Regarding leaves
kamadi2000 Jan 3, 2023
1c39533
generalUser,requestLeave
kamadi2000 Jan 3, 2023
505ffe1
Merge branch 'dev' of https://github.com/kamadi2000/HRProject into dev
kamadi2000 Jan 3, 2023
22baf15
Merge branch 'dev' into user-thamindu
thamindumk Jan 3, 2023
b203bf5
update front end HTML-Ravini
RaviniKuruppu Jan 3, 2023
f44c228
leave file changes
kamadi2000 Jan 3, 2023
e40b4e2
changes to leave requestform
kamadi2000 Jan 3, 2023
007c64c
Merge pull request #26 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 3, 2023
9925c8f
ViewLeaveCount
kamadi2000 Jan 3, 2023
af18b4d
Merge branch 'dev' into Front_HTML
RaviniKuruppu Jan 4, 2023
9632c0a
Merge pull request #27 from kamadi2000/Front_HTML
RaviniKuruppu Jan 4, 2023
ff847f5
Merge branch 'dev' into user-thamindu
thamindumk Jan 4, 2023
e7968ec
create leave status page
yasira2000 Jan 4, 2023
2a94ae7
Merge pull request #28 from kamadi2000/yasira-frontend
yasira2000 Jan 4, 2023
5481ff3
Reports
RuwanUdayanga Jan 4, 2023
e32dd03
Merge pull request #29 from kamadi2000/ruwan-backend
RuwanUdayanga Jan 4, 2023
2943e9c
Merge branch 'dev' into employee-form-kamadi
kamadi2000 Jan 4, 2023
ea6ca9a
leaveStatus
kamadi2000 Jan 4, 2023
dfe0797
Merge pull request #30 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 4, 2023
9e8dfd5
view pim
thamindumk Jan 4, 2023
b558300
Merge pull request #32 from kamadi2000/user-thamindu
thamindumk Jan 4, 2023
53fb340
Add view handling files
RuwanUdayanga Jan 4, 2023
67e5f2f
Merge pull request #33 from kamadi2000/ruwan-backend
RuwanUdayanga Jan 4, 2023
10bb6f2
sql injection
thamindumk Jan 4, 2023
9848daa
Update to leave view
RuwanUdayanga Jan 4, 2023
bb88ec1
Merge pull request #34 from kamadi2000/ruwan-backend
RuwanUdayanga Jan 4, 2023
c9f1a94
ViewRequest
kamadi2000 Jan 4, 2023
14d9f11
Merge pull request #35 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 4, 2023
311bd66
leave approve page
yasira2000 Jan 4, 2023
9450dcb
Merge branches 'dev' and 'dev' of https://github.com/kamadi2000/HRPro…
yasira2000 Jan 4, 2023
1907294
Error CorrectionViewRequest
kamadi2000 Jan 4, 2023
78d7468
set view controll to index.js
thamindumk Jan 4, 2023
350b2bf
Merge branch 'user-thamindu' into dev
thamindumk Jan 4, 2023
2d1b6eb
view request correction
thamindumk Jan 4, 2023
dbcd503
Merge branch 'user-thamindu' into dev
thamindumk Jan 4, 2023
ff7b1d4
connecting general,supervisor buttons
kamadi2000 Jan 4, 2023
ef87849
Merge pull request #36 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 4, 2023
8129876
create and delete account
thamindumk Jan 4, 2023
19995c1
Merge branch 'user-thamindu' into dev
thamindumk Jan 4, 2023
82c8fd0
Merge branch 'dev' into ruwan-backend
RuwanUdayanga Jan 4, 2023
751e7a4
Add Trigger
RuwanUdayanga Jan 5, 2023
89f433c
Merge branch 'dev' into ruwan-backend
RuwanUdayanga Jan 5, 2023
fd2e4ae
dynamicaly generated html for approve leave
yasira2000 Jan 5, 2023
52c7f35
Merge branch 'dev' into yasira-frontend
yasira2000 Jan 5, 2023
ed0069c
error correction and query corrrection
thamindumk Jan 5, 2023
242f26c
Merge branch 'user-thamindu' into dev
thamindumk Jan 5, 2023
a01332b
leave approve finished
yasira2000 Jan 5, 2023
fc8ccde
Merge pull request #38 from kamadi2000/yasira-frontend
yasira2000 Jan 5, 2023
b0741e6
rename approve leave to viewRequest
yasira2000 Jan 5, 2023
a918728
Merge branch 'dev' into ruwan-backend
RuwanUdayanga Jan 5, 2023
f9f197d
Update to ReportModel
RuwanUdayanga Jan 5, 2023
4290b24
Merge pull request #37 from kamadi2000/ruwan-backend
RuwanUdayanga Jan 5, 2023
4179fa1
fixd
thamindumk Jan 5, 2023
f934c30
Merge branch 'dev' of https://github.com/kamadi2000/HRProject into dev
thamindumk Jan 5, 2023
ab4443f
fix
thamindumk Jan 5, 2023
07fd3bd
Get Report and PIM front end-Ravini.
RaviniKuruppu Jan 5, 2023
5a6a8c3
Merge branch 'Front_HTML' of https://github.com/kamadi2000/HRProject …
RaviniKuruppu Jan 5, 2023
e7fa778
Merge branch 'dev' into Front_HTML
RaviniKuruppu Jan 5, 2023
b1dcdc1
Merge pull request #39 from kamadi2000/Front_HTML
RaviniKuruppu Jan 5, 2023
26c3b1c
viewRequestChanges
kamadi2000 Jan 5, 2023
497cb59
UserModelChanges
kamadi2000 Jan 5, 2023
477876c
UserControllerChanges
kamadi2000 Jan 5, 2023
2de11b0
AddthaminduChanges
kamadi2000 Jan 5, 2023
bf629b9
Merge pull request #40 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 5, 2023
d6191ea
ViewInfo changes
kamadi2000 Jan 5, 2023
ee4fca5
Update to triggers
RuwanUdayanga Jan 5, 2023
47e9438
Merge pull request #41 from kamadi2000/ruwan-backend
RuwanUdayanga Jan 5, 2023
07878c2
Merge branch 'dev' into employee-form-kamadi
kamadi2000 Jan 5, 2023
2771737
Merge pull request #42 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 5, 2023
e238a9d
Add Employee update
RaviniKuruppu Jan 5, 2023
d96c00e
Merge pull request #43 from kamadi2000/Front_HTML
RaviniKuruppu Jan 5, 2023
5f6e864
Add HR and Add employee front end-ravini
RaviniKuruppu Jan 5, 2023
710ce70
Update Frontend-Ravini
RaviniKuruppu Jan 5, 2023
a33b682
Merge pull request #44 from kamadi2000/Front_HTML
RaviniKuruppu Jan 5, 2023
bb8cf5c
Add leave_count row trigger
RuwanUdayanga Jan 5, 2023
3bdd660
Merge pull request #45 from kamadi2000/ruwan-backend
RuwanUdayanga Jan 5, 2023
ef56c1f
error correction
thamindumk Jan 6, 2023
40cd5dd
addUser,addLeave changes
kamadi2000 Jan 6, 2023
f8bedb8
Merge pull request #46 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 6, 2023
cd0d6dc
set edit access and implementation
thamindumk Jan 7, 2023
19883ab
Merge branch 'user-thamindu' into dev
thamindumk Jan 7, 2023
d4c41d8
error correction
thamindumk Jan 7, 2023
6512cac
delete and create hr
thamindumk Jan 7, 2023
cceefa9
change password
thamindumk Jan 7, 2023
2ee4258
Viewinfo update-ravini
RaviniKuruppu Jan 7, 2023
8f5c38b
Merge pull request #47 from kamadi2000/Front_HTML
RaviniKuruppu Jan 7, 2023
7b1fd81
setAcces
kamadi2000 Jan 7, 2023
be0d2ca
Merge branch 'dev' of https://github.com/kamadi2000/HRProject into em…
kamadi2000 Jan 7, 2023
8c182b1
Merge pull request #48 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 7, 2023
bfdf3a9
Create interface for viewinfo,viewleave-ravini
RaviniKuruppu Jan 8, 2023
b83f441
Merge branch 'dev' of https://github.com/kamadi2000/HRProject into Fr…
RaviniKuruppu Jan 8, 2023
25aadab
Merge pull request #49 from kamadi2000/Front_HTML
RaviniKuruppu Jan 8, 2023
09345d2
RemoveUser updates
kamadi2000 Jan 8, 2023
025ecae
Merge pull request #50 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 8, 2023
76f797e
Small changes
kamadi2000 Jan 8, 2023
9238b82
Merge branch 'employee-form-kamadi' into dev
kamadi2000 Jan 8, 2023
2305082
addUser updates
kamadi2000 Jan 8, 2023
5581331
changePassword pages
kamadi2000 Jan 8, 2023
e7964e0
Merge pull request #51 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 8, 2023
b6c03a8
Small changes
kamadi2000 Jan 8, 2023
523b317
Merge pull request #52 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 8, 2023
b4daad1
last time update
thamindumk Jan 8, 2023
640ee04
Merge branch 'user-thamindu' into dev
thamindumk Jan 8, 2023
a7609d6
hrmanager changes
kamadi2000 Jan 8, 2023
6561096
Merge pull request #53 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 8, 2023
e505e15
update files
yasira2000 Jan 8, 2023
0e8506b
do some correction
yasira2000 Jan 8, 2023
68491a2
editAccess, editinfo -ravini
RaviniKuruppu Jan 8, 2023
a5d072a
Merge pull request #54 from kamadi2000/Front_HTML
RaviniKuruppu Jan 8, 2023
360485f
LeaveRequest form changes
kamadi2000 Jan 8, 2023
dd151f6
applyEave updates
kamadi2000 Jan 8, 2023
8c31aa4
pageRoute updates
kamadi2000 Jan 8, 2023
8c72980
setAccessLevel updates
kamadi2000 Jan 8, 2023
0784596
superVisor html updates
kamadi2000 Jan 8, 2023
72f9fa0
viewEmergency updates
kamadi2000 Jan 8, 2023
b6596b0
Addemployee form updates
kamadi2000 Jan 8, 2023
b7c10bb
Merge pull request #55 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 8, 2023
791b8a7
view and info updates
kamadi2000 Jan 8, 2023
9198ef3
Merge pull request #56 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 8, 2023
2a7f456
generalUser updates
kamadi2000 Jan 8, 2023
78ee1a1
Admin page ,Supervisor page updates
kamadi2000 Jan 8, 2023
d8e6edc
Merge pull request #57 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 8, 2023
0e8ba74
error correction
yasira2000 Jan 9, 2023
46c527d
Merge branch 'dev' of https://github.com/kamadi2000/HRProject into dev
yasira2000 Jan 9, 2023
466175e
addEmploee form
kamadi2000 Jan 9, 2023
0531aba
Merge pull request #58 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 9, 2023
6633e8f
Merge branch 'dev' into employee-form-kamadi
kamadi2000 Jan 9, 2023
8c6e0c7
Merge branch 'dev' into employee-form-kamadi
kamadi2000 Jan 9, 2023
546b9ed
error corection
thamindumk Jan 9, 2023
66ff9a2
Merge branch 'user-thamindu' into dev
thamindumk Jan 9, 2023
69bd83e
Merge branch 'dev' into employee-form-kamadi
kamadi2000 Jan 9, 2023
df89211
edit PIM
yasira2000 Jan 9, 2023
30e8f1d
Merge branch 'dev' into employee-form-kamadi
kamadi2000 Jan 9, 2023
bfc1912
addEmployee updates
kamadi2000 Jan 9, 2023
32ec54a
Merge pull request #59 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 9, 2023
5fbb21c
error correction
yasira2000 Jan 9, 2023
6c6184b
Merge branch 'dev' of https://github.com/kamadi2000/HRProject into dev
yasira2000 Jan 9, 2023
ea27b54
error correction
yasira2000 Jan 9, 2023
f947d6d
remove script from PIM.html
yasira2000 Jan 9, 2023
8f0da44
data validation
thamindumk Jan 9, 2023
276cd0d
UserController updates
kamadi2000 Jan 9, 2023
888362c
change names of files
thamindumk Jan 9, 2023
49756c8
Merge branch 'dev' into employee-form-kamadi
kamadi2000 Jan 9, 2023
5147614
Merge branch 'dev' into employee-form-kamadi
kamadi2000 Jan 9, 2023
dd22c00
error correction
thamindumk Jan 9, 2023
f4aa3ff
Merge branch 'dev' into employee-form-kamadi
kamadi2000 Jan 9, 2023
2172ffb
error correction
thamindumk Jan 9, 2023
a10b04a
do some updates
yasira2000 Jan 9, 2023
69fba94
Merge branch 'dev' of https://github.com/kamadi2000/HRProject into dev
yasira2000 Jan 9, 2023
c7481c2
Merge branch 'dev' into employee-form-kamadi
kamadi2000 Jan 9, 2023
6e63b31
error correction on set active time
thamindumk Jan 9, 2023
8def7f1
Merge branch 'user-thamindu' into dev
thamindumk Jan 9, 2023
156eb4b
Custom Reports
RuwanUdayanga Jan 9, 2023
06dc272
edit frontend-Ravini
RaviniKuruppu Jan 9, 2023
3c75d42
Merge pull request #61 from kamadi2000/Front_HTML
RaviniKuruppu Jan 9, 2023
9d71f1e
Merge branch 'dev' into employee-form-kamadi
kamadi2000 Jan 10, 2023
c58787b
add Employee pages updates
kamadi2000 Jan 10, 2023
4fdf395
Merge pull request #62 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 10, 2023
62a1db9
readme start
thamindumk Jan 10, 2023
aa1fb48
recodes msg change
thamindumk Jan 10, 2023
9e9519d
error correction
thamindumk Jan 10, 2023
06b3c67
README file-ravini
RaviniKuruppu Jan 10, 2023
bcee726
Merge pull request #63 from kamadi2000/Front_HTML
RaviniKuruppu Jan 10, 2023
e38f977
edit employment
thamindumk Jan 11, 2023
ed84b59
Add Hr,Add employee updates
kamadi2000 Jan 13, 2023
0be8fdd
Merge pull request #64 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 13, 2023
b869fc9
Merge pull request #60 from kamadi2000/ruwan-backend
RuwanUdayanga Jan 13, 2023
9dfd6f7
Small changes
kamadi2000 Jan 13, 2023
6b1f4d9
Merge pull request #65 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 13, 2023
97f0712
Small changes
RuwanUdayanga Jan 13, 2023
4cb413d
Merge pull request #66 from kamadi2000/ruwan-backend
RuwanUdayanga Jan 13, 2023
38e5506
Small changes to remove hr manager
kamadi2000 Jan 13, 2023
859e91d
Merge branch 'dev' into employee-form-kamadi
kamadi2000 Jan 13, 2023
84f9eae
Merge pull request #67 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 13, 2023
7e8e61f
Signout corrections
kamadi2000 Jan 13, 2023
05f4214
addHr acc updates
kamadi2000 Jan 13, 2023
02b61ee
add Reports
kamadi2000 Jan 13, 2023
9c4385c
Report model updates
kamadi2000 Jan 13, 2023
d4d189b
Merge pull request #68 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 13, 2023
bbe12bb
sticky top nav bar
kamadi2000 Jan 13, 2023
1ba13d1
ViewEmergencyTableCreate - Yasira
kamadi2000 Jan 13, 2023
aaa2822
Merge pull request #69 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 13, 2023
6fb185e
emergency js - yasira
kamadi2000 Jan 13, 2023
80f22f3
Merge pull request #70 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 13, 2023
3350f2a
date error fixed
thamindumk Jan 13, 2023
c3b180d
Add new custom field
RuwanUdayanga Jan 13, 2023
cd1be6d
Merge pull request #71 from kamadi2000/ruwan-backend
RuwanUdayanga Jan 13, 2023
f84ec38
Add View Tables - Yasira
kamadi2000 Jan 13, 2023
a05466b
Merge pull request #72 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 13, 2023
c54d39a
Small changes
kamadi2000 Jan 13, 2023
2ae4f75
Merge pull request #73 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 13, 2023
2d6fc30
date correction
thamindumk Jan 13, 2023
7757419
add drop down list to emplyment table
yasira2000 Jan 14, 2023
a6b6cd3
Merge pull request #74 from kamadi2000/yasira-frontend
yasira2000 Jan 14, 2023
1f031d8
do some changes
yasira2000 Jan 14, 2023
d7d35cd
Merge pull request #75 from kamadi2000/yasira-frontend
yasira2000 Jan 14, 2023
1c76cc3
small changes
RuwanUdayanga Jan 14, 2023
ee5ac1a
Merge pull request #76 from kamadi2000/ruwan-backend
RuwanUdayanga Jan 14, 2023
3d866bf
create job title report
yasira2000 Jan 14, 2023
d00bbce
Merge pull request #77 from kamadi2000/yasira-frontend
yasira2000 Jan 14, 2023
d8b209c
correction
RuwanUdayanga Jan 14, 2023
28ba76f
Merge pull request #78 from kamadi2000/ruwan-backend
RuwanUdayanga Jan 14, 2023
b18a1a2
do some changes
yasira2000 Jan 14, 2023
4ea58bd
Merge pull request #79 from kamadi2000/yasira-frontend
yasira2000 Jan 14, 2023
e615a86
Jobtitle report updates
kamadi2000 Jan 14, 2023
edc46d6
Merge pull request #80 from kamadi2000/employee-form-kamadi
kamadi2000 Jan 14, 2023
d51eac9
error correction
yasira2000 Jan 14, 2023
68f34fe
Merge pull request #81 from kamadi2000/yasira-frontend
yasira2000 Jan 14, 2023
81bc25e
time set
thamindumk Jan 14, 2023
3cc4387
set access for report
thamindumk Jan 14, 2023
e74d823
err
thamindumk Jan 14, 2023
be43d23
err crrection
thamindumk Jan 14, 2023
48ea49e
add procedures
thamindumk Jan 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified README.md
Binary file not shown.
2 changes: 1 addition & 1 deletion backend/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
node_modules
config.js
yarn.lock
26 changes: 20 additions & 6 deletions backend/index.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,42 @@
const express = require('express')
const path = require('path')
const mysql = require('mysql')

const { viewController } = require('../backend/src/controllers/ViewController');
const { leaveTriggerController } = require('../backend/src/controllers/leaveTriggerController');

//const bodyParser = require('body-parser')

const employeeRoutes = require('./src/routes/employeeRoutes');
const authRoutes = require('./src/routes/authRoutes');
const userRoutes = require('./src/routes/thamindu');
const { post } = require('./src/routes/employeeRoutes');
const userRoutes = require('./src/routes/userRoutes');
const pageRoutes = require('./src/routes/pageRoutes');
const yasiraRoutes = require('./src/routes/yasira');
const ReportRoutes = require('./src/routes/ReportRoutes');
const app = express()
const port = 8000;

app.use(async(req,res,next)=>{
try{
const controllerLeave = new leaveTriggerController();
const controllerView = new viewController();
await controllerLeave.leaveTrigger();
await controllerLeave.leaveCountColomnTrigger();
await controllerView.createView();
next()
}catch(e){
console.log(e)
}
})

app.use(express.json());
app.use(express.urlencoded({extended: false}));

let initialPath = path.join(__dirname,"../public");
app.use(express.static(initialPath));

app.use('/employee',employeeRoutes);
app.use('/auths',authRoutes);
app.use('/user',userRoutes);
app.use('', pageRoutes);
app.use('/yasira');
app.use('/reports',ReportRoutes);

app.listen(port, () => {
console.log(`Example app listening on port ${port}`)
Expand Down
99 changes: 99 additions & 0 deletions backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"express-session": "^1.17.3",
"jsonwebtoken": "^9.0.0",
"mysql": "^2.18.1",
"mysql2": "^2.3.3",
"nodemon": "^2.0.20"
}
}
Loading