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

[pull] master from orangehrm:master #1

Open
wants to merge 478 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
478 commits
Select commit Hold shift + click to select a range
8347871
OHRM5X-705: Refactor admin configure modules API (#951)
VageeshOrangeHRM Oct 8, 2021
ca18b67
OHRM5X-320: Fix leave list issues (#952)
Oct 8, 2021
b74b51e
OHRM5X-752: Fix assign leave issues (#950)
VageeshOrangeHRM Oct 8, 2021
828c8b8
OHRM5X-732: Initiate pim defined report API (#953)
VageeshOrangeHRM Oct 11, 2021
b638b19
OHRM5X-320: Fix apply/assign leave screens issues (#955)
Oct 12, 2021
05be27f
OHRM5X-802 [PIM] [Data Import] Incorrect toast message is displayed w…
yasirunilan Oct 14, 2021
87e3b9e
OHRM5X-731: Develop pim defined report API create & update (#958)
VageeshOrangeHRM Oct 14, 2021
67c4ea2
OHRM5X-763: Fix country code validation in pim csv import (#962)
yasirunilan Oct 15, 2021
55073a7
OHRM5X-759: Fix file type restriction in pim csv import (#963)
yasirunilan Oct 15, 2021
9a666a4
OHRM5X-624: Develop PIM report display & filter fields (#954)
RajithaKumara Oct 15, 2021
dece8ef
OHRM5X-275: Admin - Develop Email Subscription Screens (#959)
Oct 18, 2021
ddef18c
OHRM5X-732: Develop pim defined report API getOne (#966)
VageeshOrangeHRM Oct 20, 2021
0202bc2
OHRM5X-733: Develop PIM report save screen (#964)
Oct 20, 2021
7a7235e
OHRM5X-624: Add unit tests & menu item for pim report (#968)
RajithaKumara Oct 21, 2021
a73b05d
OHRM5X-763: Handle CSV contains different column order in pim import …
yasirunilan Oct 25, 2021
af9491d
OHRM5X-731: Initiate normalizable for filter fields
RajithaKumara Oct 22, 2021
73cb71e
OHRM5X-731: Develop normalizable for PIM reports filter fields
VageeshOrangeHRM Oct 25, 2021
43ffab8
OHRM5X-765: Develop email subscription APIs (#967)
VageeshOrangeHRM Oct 25, 2021
1dc5cc9
OHRM5X-604: Fix pim report to action buttons are not placed in the co…
yasirunilan Oct 25, 2021
5438aa6
OHRM5X-803: Develop PIM report edit screen (#974)
Oct 26, 2021
377ada4
OHRM5X-756: Fix work shift screen issues (#975)
VageeshOrangeHRM Oct 27, 2021
4b6c01c
OHRM5X-660: Fix email subscription issues (#978)
VageeshOrangeHRM Oct 27, 2021
af50944
OHRM5X-791: Develop help - support page (#977)
Oct 28, 2021
8e2c481
OHRM5X-822: Develop about organization API (#980)
VageeshOrangeHRM Oct 28, 2021
fc4675a
OHRM5X-790: Develop about page (#979)
Oct 29, 2021
cbdbe8e
OHRM5X-734: Develop leave email notifications (#983)
RajithaKumara Nov 1, 2021
0b6f81c
OHRM5X-823: Develop update password screen (#981)
VageeshOrangeHRM Nov 1, 2021
d24bded
OHRM5X-820: Develop module under development page (#982)
VageeshOrangeHRM Nov 1, 2021
0eb40fe
OHRM5X-846: Fix apply/assign leave screens issues (#984)
RajithaKumara Nov 2, 2021
1a852ac
OHRM5X-677: Fix leave list screen issues (#985)
RajithaKumara Nov 3, 2021
c458fca
OHRM5X-898: Fix password update screen back behavior (#988)
VageeshOrangeHRM Nov 3, 2021
50be3cd
OHRM5X-851: Develop menu breadcrumb for layout (#987)
VageeshOrangeHRM Nov 3, 2021
5576c60
OHRM5X-171: Improve menu navigation & side panel (#991)
Nov 4, 2021
838c079
OHRM5X-844: Fix leave entitlement screen issues (#989)
RajithaKumara Nov 5, 2021
e9eaa94
OHRM5X-904: Fix PIM reports screen issues (#996)
Nov 8, 2021
c3ba1dd
OHRM5X-374: Add username validation and work email validation (#992)
VageeshOrangeHRM Nov 8, 2021
15390ba
OHRM5X-904: Fix PIM reports defects (#997)
Nov 9, 2021
6bff4b7
OHRM5X-753: Fix pay grade screen issues (#990)
VageeshOrangeHRM Nov 9, 2021
57878ec
OHRM5X-708: Fix leave report issues (#995)
RajithaKumara Nov 9, 2021
a420161
OHRM5X-879: Fix pim report subunit filter issue (#1003)
RajithaKumara Nov 10, 2021
a8cd499
OHRM5X-509: Fix leave module related issues (#1007)
RajithaKumara Nov 11, 2021
4106e14
OHRM5X-320: Improve leave & pim screens (#1000)
Nov 11, 2021
c3d7b2b
OHRM5X-934: Change @orangehrm aliases to @ohrm (#1004)
Nov 11, 2021
7e8df01
OHRM5X-813: Develop page for disabled modules (#999)
VageeshOrangeHRM Nov 11, 2021
03b84fb
OHRM5X-16: Log user logins (#1006)
VageeshOrangeHRM Nov 12, 2021
c626353
OHRM5X-920: Add pessimistic locking when mail sending (#1008)
RajithaKumara Nov 12, 2021
d161a90
OHRM5X-933: Add CSRF token to login page (#1002)
RajithaKumara Nov 12, 2021
6f808f7
OHRM5X-320: P2 Defect fixes (#1010)
Nov 12, 2021
995f6c8
OHRM5X-371: Add support sort by supervisor name in employee list (#1011)
RajithaKumara Nov 13, 2021
ae00979
OHRM5X-951: Update product version in footer and about modal (#1009)
VageeshOrangeHRM Nov 15, 2021
6f20f26
OHRM5X-818: Handle leave/ pim report permissions (#1016)
RajithaKumara Nov 16, 2021
3049ee2
OHRM5X-854: Limit subscribers shown in email subscription list (#1013)
Nov 16, 2021
dee043d
OHRM5X-875: Add email configuration password mask (#1012)
VageeshOrangeHRM Nov 16, 2021
133606d
OHRM5X-889: Group PIM report display fields even when exclude header …
RajithaKumara Nov 16, 2021
0061f0b
OHRM5X-853: Fix email subscriber pagination issue (#1015)
VageeshOrangeHRM Nov 16, 2021
5282497
OHRM5X-232: PIM Employee list, stop user redirect on click delete (#1…
Nov 16, 2021
5d2c4c2
OHRM5X-960: Fix paygrade min, max validation (#1022)
VageeshOrangeHRM Nov 17, 2021
cbba24a
OHRM5X-912: Update content of module under development page (#1020)
Nov 17, 2021
6c16d80
OHRM5X-565: Fix location list sort by country name (#1021)
RajithaKumara Nov 17, 2021
6c7526e
OHRM5X-921: Resolve rebase conflicts onto 4.9
RajithaKumara Nov 17, 2021
979f837
OHRM5X-965: Fix PIM add salary issue with min/max amount (#1025)
Nov 18, 2021
7568bbd
OHRM5X-963: Implement registration data capturing (#1023)
RajithaKumara Nov 18, 2021
1a92d0f
OHRM5X-963: Make product mode as prod (#1026)
RajithaKumara Nov 19, 2021
e6481fc
OHRM5X-555 : Updated OHRM-OS 5.0-beta change log (#1027)
VageeshOrangeHRM Nov 24, 2021
989fccd
OHRM5X-552: Initiate time plugin & develop customer screen (#1028)
VageeshOrangeHRM Dec 1, 2021
527e917
OHRM5X-963: Make default product mode as dev (#1031)
RajithaKumara Dec 1, 2021
5ecc8f5
OHRM5X-968: Develop time - my timesheet base components (#1033)
Dec 1, 2021
3ad3113
OHRM5X-982: Update yarn.lock since yarn install failed on Node 16.x (…
RajithaKumara Dec 3, 2021
cd77093
OHRM5X-970: Develop time - define start day of the week screen (#1032)
VageeshOrangeHRM Dec 6, 2021
97a8c7d
OHRM5X-736: Add entity unique property check validation rule (#916)
RajithaKumara Dec 6, 2021
0b59a29
OHRM5X-556: Time - Employee timesheet base components (#1035)
Dec 7, 2021
786df2d
OHRM5X-554: Develop time project activity API (#1029)
VageeshOrangeHRM Dec 8, 2021
775e1b7
OHRM5X-1016: Add vue3-recommended lint rules
RajithaKumara Nov 27, 2021
45b155f
OHRM5X-1016: Add lint fixes for vue3-recommended lint rule
Dec 1, 2021
16bd186
OHRM5X-1016: Add lint fixes for vue3-strongly-recommended rule
RajithaKumara Dec 9, 2021
5f80db5
OHRM5X-553: Develop time - project screen (#1036)
SandeepaOHRM Dec 10, 2021
cd3a26d
OHRM5X-971: Develop time - project copy activities modal (#1040)
Dec 10, 2021
068fcf1
OHRM5X-555: Develop my timeseeht items API get operation (#1041)
RajithaKumara Dec 10, 2021
02b69f0
OHRM5X-553: Develop time - edit project screen (#1045)
SandeepaOHRM Dec 10, 2021
df5a498
OHRM5X-988: Develop time - timesheet create operation (#1043)
VageeshOrangeHRM Dec 13, 2021
f6666dd
OHRM5X-972: Develop time - project activities screens (#1046)
Dec 13, 2021
1ab334f
OHRM5X-1017: Bump symfony core components to 5.4 LTS version (#1042)
RajithaKumara Dec 13, 2021
1d20bd2
OHRM5X-1019: Fix time - project add/edit screens UI issues (#1048)
Dec 13, 2021
036bdf0
OHRM5X-1017: Fix unit test workflow issue (#1051)
RajithaKumara Dec 13, 2021
542e487
OHRM5X-988: Fix TimesheetPeriodService case sensitive issue (#1052)
VageeshOrangeHRM Dec 13, 2021
5e117d3
OHRM5X-1016: Fix leave type dropdown not selecting issue (#1050)
Dec 14, 2021
ee5935a
OHRM5X-1020: Add php-cs-fixer (#1049)
RajithaKumara Dec 14, 2021
7a4fe4c
OHRM5X-993: Develop time - timesheet action log API (#1047)
SandeepaOHRM Dec 15, 2021
883b7c3
OHRM5X-991: Add time - my timesheet allowed actions (#1053)
VageeshOrangeHRM Dec 16, 2021
27cec35
OHRM5X-989: Develop my timesheet entries API update operation (#1054)
RajithaKumara Dec 17, 2021
dc64eb5
OHRM5X-986: Create default timesheet in my timesheet screen (#1055)
VageeshOrangeHRM Dec 17, 2021
248b713
OHRM5X-1019: Fix project admin autocomplete styles (#1058)
Dec 20, 2021
d862e7e
OHRM5X-998: Develop time - my timesheet get all operation (#1057)
SandeepaOHRM Dec 21, 2021
4bf48a5
OHRM5X-994: Develop time - my timesheet state update operation (#1059)
VageeshOrangeHRM Dec 21, 2021
c3d4ce9
OHRM5X-997: Develop time - timesheet comment API (#1062)
VageeshOrangeHRM Dec 22, 2021
458c54c
OHRM5X-990: Develop duplicate project activity validation API (#1061)
SandeepaOHRM Dec 23, 2021
a206240
OHRM5X-1027: Add customer, project entity support to user role manage…
RajithaKumara Dec 23, 2021
f1b9d9c
OHRM5X-997: Improve time - timesheet comment API param validation (#1…
VageeshOrangeHRM Dec 23, 2021
fe6b655
OHRM5X-976: Develop time - project activity unique name validation AP…
VageeshOrangeHRM Dec 24, 2021
084901d
OHRM5X-999: Develop time - time format config API (#1065)
SandeepaOHRM Dec 24, 2021
3a8d3b6
OHRM5X-995: Add time - project auto complete support (#1067)
VageeshOrangeHRM Dec 24, 2021
ade6a30
OHRM5X-1004: Develop time - employee timesheet API (#1069)
RajithaKumara Dec 28, 2021
6700cee
OHRM5X-1003: Develop time - employee timesheet API getAll operation (…
SandeepaOHRM Dec 28, 2021
7cd9902
OHRM5X-977: Connect time - my timesheet screen with APIs (#1073)
Jan 3, 2022
d566ac2
OHRM5X-1038: Develop time - employee timesheets create, comment (#1072)
SandeepaOHRM Jan 3, 2022
f3bb982
OHRM5X-1000: Develop time - copy activity API (#1068)
VageeshOrangeHRM Jan 3, 2022
f48abf8
OHRM5X-1032: Improve validation for non-existent project, activity id…
RajithaKumara Jan 3, 2022
6a9b595
OHRM5X-1029: Fix time - project screens issues (#1076)
Jan 4, 2022
98cbb43
OHRM5X-1025: Fix time - project screen issues (#1079)
SandeepaOHRM Jan 4, 2022
50a93ee
OHRM5X-1005: Develop time - employee timesheet API update operation (…
VageeshOrangeHRM Jan 4, 2022
e997126
OHRM5X-1028: Fix time - customer modal required text break to next li…
Jan 4, 2022
2f80e21
OHRM5X-984: Develop time - employee timesheet report screen (#1078)
Jan 6, 2022
391f2dc
OHRM5X-987: Develop time - default timesheet API get operation (#1082)
SandeepaOHRM Jan 6, 2022
c890f22
OHRM5X-1001: Develop time - employee timesheet list API get operation…
VageeshOrangeHRM Jan 7, 2022
c430cfb
OHRM5X-1006: Initiated time - report APIs (#1085)
VageeshOrangeHRM Jan 7, 2022
c6b537a
OHRM5X-983: Develop time - project & project activity details report …
Jan 11, 2022
79b3c68
OHRM5X-978: Connect time - employee timesheet screen with APIs (#1087)
Jan 12, 2022
79b1cd2
OHRM5X-979: Create database snapshot & restore while test automation …
RajithaKumara Jan 12, 2022
3fa466f
OHRM5X-1006: Develop time - project report API (#1086)
VageeshOrangeHRM Jan 13, 2022
f094ef0
OHRM5X-1010: Develop time - employee project report API (#1088)
SandeepaOHRM Jan 18, 2022
0aac9ee
OHRM5X-1035: Restrict inaccessible projects for project admin (#1092)
RajithaKumara Jan 18, 2022
9475aab
OHRM5X-1044: Improve time - timesheet comment API (#1094)
VageeshOrangeHRM Jan 18, 2022
7162b60
OHRM5X-1057: Restrict edit timesheet screen access by user role (#1096)
RajithaKumara Jan 19, 2022
e54c91b
OHRM5X-1106: Connect time - project report with API (#1097)
VageeshOrangeHRM Jan 20, 2022
a2019e2
OHRM5X-1107: Connect time - employee report with API (#1099)
SandeepaOHRM Jan 20, 2022
fd8e28e
OHRM5X-1075: initiate attendance plugin directory structure and entit…
SandeepaOHRM Jan 21, 2022
151019b
OHRM5X-561: Develop attendance - punch in/out & config screens (#1098)
Jan 21, 2022
67c7557
OHRM5X-1008: Develop time - project activity detailed report (#1095)
VageeshOrangeHRM Jan 21, 2022
1404d49
OHRM5X-320: Prevent deletion of used project, activities (#1093)
Jan 24, 2022
22897ba
OHRM5X-1034: Separate project admin list from employee API (#1101)
RajithaKumara Jan 24, 2022
e66e2da
OHRM5X-1079: Develop attendance - configuration API (#1104)
SandeepaOHRM Jan 24, 2022
e1ec255
OHRM5X-1013: Custom cypress commands added (#1056)
Jan 27, 2022
49122f8
OHRM5X-1071: Fix no record found issue in edit timesheet screen (#1102)
VageeshOrangeHRM Jan 28, 2022
f7f64f5
OHRM5X-1082: Develop attendance - employee latest record API (#1110)
VageeshOrangeHRM Jan 28, 2022
7534ede
OHRM5X-1095: Develop attendance - employee records screen (#1111)
Feb 1, 2022
6e115a6
OHRM5X-1096: Develop attendance - my attendance records screen (#1113)
Feb 1, 2022
2bf9ae4
OHRM5X-1084: Develop attendance - punch in & punch out overlap valida…
VageeshOrangeHRM Feb 1, 2022
7d1aa4c
OHRM5X-320: Fix time - timesheet screen issues (#1114)
Feb 1, 2022
dd6144e
OHRM5X-1097: Initiate i18n language strings endpoint (#1115)
RajithaKumara Feb 3, 2022
96f44bc
OHRM5X-559: Develop attendance - summary report API (#1119)
VageeshOrangeHRM Feb 7, 2022
902f7e2
OHRM5X-1099: Develop attendance - edit my attendance screens (#1118)
Feb 8, 2022
a68bb68
OHRM5X-1086: Develop attendance - my/employee punch in/out APIs (#1116)
SandeepaOHRM Feb 11, 2022
46372a5
OHRM5X-1111: Fix time - report related defects (#1120)
VageeshOrangeHRM Feb 14, 2022
f1a34ef
OHRM5X-1126: Develop attendance - current UTC datetime (#1125)
SandeepaOHRM Feb 14, 2022
3eb1ff0
OHRM5X-1135: Develop attendance - punch in/out overlap validation API…
VageeshOrangeHRM Feb 21, 2022
9a0527c
OHRM5X-1080: Connect attendance - punch in/out screen with APIs (#1126)
Feb 21, 2022
d37fafb
OHRM5X-1091: Develop attendance - records get-one/update operations (…
SandeepaOHRM Feb 22, 2022
fb11c70
OHRM5X-979: Enable cypress experimentalInteractiveRunEvents config (#…
RajithaKumara Feb 22, 2022
e6ad039
OHRM5X-1122: Develop attendance - summary report (#1130)
Feb 22, 2022
efbc080
OHRM5X-1094: Develop attendance - my record delete operation (#1136)
SandeepaOHRM Feb 23, 2022
be53f5f
OHRM5X-1090: Develop attendance - my record getAll operation (#1139)
VageeshOrangeHRM Feb 23, 2022
b296c03
OHRM5X-1093: Develop attendance - employee record delete operation (#…
SandeepaOHRM Feb 24, 2022
eb456a5
OHRM5X-564: Connect attendance - edit my attendance screen with APIs …
Feb 24, 2022
8a8cc3d
OHRM5X-1134: Initiate maintenance - purge employees with strategies …
devishke-orange Feb 25, 2022
778a222
OHRM5X-1110: Fix time - project/ employee report screen issues (#1143)
SandeepaOHRM Feb 25, 2022
e78c4a8
OHRM5X-1089: Develop attendance - employee summary API (#1142)
VageeshOrangeHRM Feb 25, 2022
b60576e
OHRM5X-1133: Initiate maintenance - access employee records (#1141)
Ajiharan007 Feb 25, 2022
586a80d
OHRM5X-1089: Add attendance - employee summary API tests (#1146)
VageeshOrangeHRM Feb 28, 2022
f90a02a
OHRM5X-1140: Develop maintenance - purge employees API (#1144)
devishke-orange Feb 28, 2022
d74449f
OHRM5X-1132: Develop migration script for language strings and transl…
SharukaNP Feb 28, 2022
2d0446b
OHRM5X-1098: Connect attendance - employee attendance screens with AP…
Mar 1, 2022
a365e56
OHRM5X-1115: Fix time - customer screen related issues (#1147)
VageeshOrangeHRM Mar 2, 2022
6fb10c3
OHRM5X-1127: Develop attendance - timezones API (#1149)
SandeepaOHRM Mar 2, 2022
1914056
OHRM5X-1159: Modify attendance - entity & APIs to support with timezo…
SandeepaOHRM Mar 3, 2022
dfdb09e
OHRM5X-1160: Add attendance - timezone name upgrader script (#1156)
VageeshOrangeHRM Mar 3, 2022
0b1b7b2
OHRM5X-1154: Fix attendance - summary report filter issue (#1158)
VageeshOrangeHRM Mar 3, 2022
880d34b
OHRM5X-1177: Change timezone autocomplete to dropdown (#1160)
SandeepaOHRM Mar 4, 2022
1c8269c
OHRM5X-1147: Develop maintenance - purge employees screen (#1155)
devishke-orange Mar 9, 2022
9898c5f
OHRM5X-1145: Develop maintenance - access employee records (#1164)
Ajiharan007 Mar 10, 2022
76a5608
OHRM5X-1121: Improve selection of selected menu item (#1166)
RajithaKumara Mar 14, 2022
48ecaf1
OHRM5X-1146: Restrict maintenance - access/purge employee screens wit…
devishke-orange Mar 16, 2022
1d6684f
OHRM5X-1184: Add performance module entities (#1184)
Ajiharan007 Mar 22, 2022
3e32a2b
OHRM5X-1211: Improve maintenance - access employee file download (#1…
Ajiharan007 Mar 24, 2022
0440ef8
OHRM5X-1180: Hide purged employee data from leave/ admin/ pim (#1189)
devishke-orange Mar 24, 2022
d904a08
OHRM5X-664: Improve file extension validation (#1198)
devishke-orange Mar 28, 2022
2423a6b
OHRM5X-1225: Preserve purged employees timesheet actions (#1195)
SharukaNP Mar 28, 2022
65e29f7
OHRM5X-1230: Fix maintenance - access employee failure with subunits …
Ajiharan007 Mar 30, 2022
ca12304
OHRM5X-1216: Add DB migrations from 4.10 to 5.0 version (#1207)
RajithaKumara Apr 4, 2022
185d07d
OHRM5X-1174: Improve attendance/time related issues (#1203)
SandeepaOHRM Apr 4, 2022
4f7e16a
OHRM5X-666: Improve session handling at the login (#1202)
devishke-orange Apr 4, 2022
107aa0a
OHRM5X-1216: Initiate installer routing (#1209)
RajithaKumara Apr 5, 2022
a0fb873
OHRM5X-1181: Change attendance timezone fields to double column width…
SandeepaOHRM Apr 5, 2022
f8ac855
OHRM5X-1262: Initiate upgrader FE directory structure (#1211)
RajithaKumara Apr 6, 2022
8935f89
OHRM5X-1243: Improve email/phone input validation for APIs (#1210)
devishke-orange Apr 7, 2022
2c585ce
OHRM5X-1123: Initiate front-end i18n support (#1122)
Feb 28, 2022
46e3459
OHRM5X-1131: Initiate translator for back-end translations (#1145)
RajithaKumara Feb 28, 2022
21e0cbe
OHRM5X-285: Develop admin - localization config screen (#1151)
RajithaKumara Mar 1, 2022
5c7068e
OHRM5X-1151: Define i18n - admin module language strings (#1153)
SharukaNP Mar 3, 2022
0f0aaf2
OHRM5X-1124: Define i18n - pim module language strings (#1157)
SharukaNP Mar 10, 2022
0900757
OHRM5X-1151: Define i18n - general language strings (#1167)
SharukaNP Mar 10, 2022
8e84cef
OHRM5X-1162: Define i18n - leave language strings (#1165)
SharukaNP Mar 14, 2022
dea2009
OHRM5X-1179: Add global config value to enable/disable i18n translati…
RajithaKumara Mar 16, 2022
1fbce0e
OHRM5X-1163: Define i18n - time module language strings (#1179)
SharukaNP Mar 16, 2022
b3c652e
OHRM5X-1164: Define i18n - attendance module language strings (#1181)
SharukaNP Mar 18, 2022
12bac9a
OHRM5X-1213: Define i18n - maintenance purge screen language strings …
devishke-orange Mar 18, 2022
6133101
OHRM5X-1205: Define i18n - maintenance access record screen language …
Ajiharan007 Mar 23, 2022
ab55b09
OHRM-285: Improve admin - localization config screen (#1199)
Ajiharan007 Mar 28, 2022
0e74432
OHRM5X-1202: Add missing language strings in admin/pim/leave/time (#1…
SharukaNP Mar 28, 2022
33b22b1
OHRM5X-1234: Fix i18n language string reactive issue (#1214)
Apr 7, 2022
73487bc
OHRM5X-1202: Add missing language strings in admin/pim/leave/time (#1…
SharukaNP Apr 7, 2022
f700c4e
OHRM5X-1234: Add installer support for i18n
RajithaKumara Apr 7, 2022
221e446
OHRM5X-1234: Add missing mock lang string for rules unit test
Apr 8, 2022
be4e118
OHRM5X-1262: Develop upgrader - layout & welcome screen (#1213)
Apr 8, 2022
4a68761
OHRM5X-175: Develop forgot password screens (#1201)
Ajiharan007 Apr 11, 2022
94d1dc9
OHRM5X-1261: Add DB migrations from 4.3.3 to 4.10 version (#1212)
SharukaNP Apr 11, 2022
4262ba3
OHRM5X-786: Develop upgrader - validate database configuration API (#…
SandeepaOHRM Apr 11, 2022
ae09dc1
OHRM5X-1272: Fix i18n translation test tool (#1225)
SharukaNP Apr 12, 2022
8fc7a78
OHRM5X-1233: Add missing language strings in oxd components(#1220)
Apr 12, 2022
5f90136
OHRM5X-1235: Improve internal server error handling (#1216)
devishke-orange Apr 12, 2022
b01842d
OHRM5X-668: Improve BE password validation (#1224)
devishke-orange Apr 15, 2022
ec2db3d
OHRM5X-1252: Execute upgrader migration scripts (#1223)
RajithaKumara Apr 15, 2022
152aff5
OHRM5X-1245: Develop upgrader - system check API (#1227)
SandeepaOHRM Apr 15, 2022
804fa95
OHRM5X-785: Initiate upgrader screens (#1221)
Ajiharan007 Apr 15, 2022
b536181
OHRM5X-1279: Rename symfony directory to src (#1230)
RajithaKumara Apr 15, 2022
69205c2
OHRM5X-1250: Connect upgrader - database config/ system check screens…
Ajiharan007 Apr 18, 2022
db3567a
OHRM5X-1262: Develop upgrader - layout (#1218)
Apr 18, 2022
6574c61
OHRM5X-1254: Add upgrader - current screen select support (#1229)
RajithaKumara Apr 18, 2022
58eb65b
OHRM5X-1260: Add DB migrations from 4.0 to 4.3.3 version (#1222)
SharukaNP Apr 18, 2022
2f1589e
OHRM5X-1245: Refactor upgrader - system check API (#1235)
SandeepaOHRM Apr 19, 2022
37bb5c6
OHRM5X-1272: Add i18n translation language packs (#1232)
SharukaNP Apr 19, 2022
b141b5f
OHRM5X-1271: Add unique validation for PIM other email field (#1236)
devishke-orange Apr 20, 2022
be92b05
OHRM5X-1250: Develop upgrader - execute upgrading (#1240)
Apr 20, 2022
ccb2b3f
OHRM5X-1264: Prevent showing invalid parameter toast (#1241)
devishke-orange Apr 21, 2022
936121b
OHRM5X-1273: Translate leave/time/pim report headers (#1231)
SharukaNP Apr 21, 2022
6ebf6cd
OHRM5X-1267: Fix broken paygrade permission issue (#1245)
RajithaKumara Apr 22, 2022
630332a
OHRM5X-1278: Update reset password email template (#1244)
Ajiharan007 Apr 22, 2022
862da61
OHRM5X-1265: Invalidate menu cache when enabling/disabling modules (#…
devishke-orange Apr 22, 2022
687638d
OHRM5X-1251: Send upgrader - registration data (#1242)
SandeepaOHRM Apr 23, 2022
4060291
OHRM5X-1284: Develop installer related APIs (#1238)
RajithaKumara Apr 23, 2022
7299538
OHRM5X-1296: Prevent error toast message showing when applying/assign…
devishke-orange Apr 25, 2022
1f03e0b
OHRM5X-1295: Develop installer - database config screen (#1251)
Apr 25, 2022
6a90ca8
OHRM5X-1287: Handle already existing project for a specific customer …
SandeepaOHRM Apr 25, 2022
f66191f
OHRM5X-1270: Restrict Add button for supervisors in employee list scr…
Ajiharan007 Apr 25, 2022
9a628be
OHRM5X-1300: Develop installer - admin user creation screen (#1252)
devishke-orange Apr 26, 2022
1dc82f4
OHRM5X-1267: Fix upgrader related issues (#1248)
SharukaNP Apr 26, 2022
e99d137
OHRM5X-1267: Fix upgrader 4.1/4.1.1 migrations failures (#1254)
RajithaKumara Apr 26, 2022
2cc3f2f
OHRM5X-1297: Validate leave - fromTime toTime on assign/apply submit …
devishke-orange Apr 27, 2022
80c7a3d
OHRM5X-782: Send installer - registration data (#1258)
SandeepaOHRM Apr 27, 2022
d81a089
OHRM5X-1288: Fix upgrader - UI issues (#1253)
Ajiharan007 Apr 27, 2022
8ae337e
OHRM5X-781: Develop installer screens (#1255)
Apr 27, 2022
acc70bd
OHRM5X-1285: Fix i18n - customized string preservation (#1257)
SharukaNP Apr 28, 2022
1dee942
OHRM5X-782: Send installer - registration data (#1261)
SandeepaOHRM Apr 28, 2022
8f6a78f
OHRM5X-1318: Improve installer - database connection error message ha…
SandeepaOHRM Apr 29, 2022
9c7d65c
OHRM5X-1325: Fix pim - failure in 4x report editing (#1263)
SharukaNP Apr 29, 2022
9e524c7
OHRM5X-1321: Fix redirection issue from installer to application (#1264)
RajithaKumara Apr 29, 2022
69ff0b8
OHRM5X-320: Fix installer related issues (#1262)
Apr 29, 2022
72b5b01
OHRM5X-1202: Add missing language strings in leave (#1267)
SharukaNP Apr 29, 2022
3337bc6
OHRM5X-1329: Fix leave list action buttons alignment (#1269)
Apr 29, 2022
7bd1095
OHRM5X-1328: Allow empty passwords in installer (#1268)
RajithaKumara Apr 30, 2022
7a73e45
OHRM-1149: Set up a security policy (#1270)
RajithaKumara May 1, 2022
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
Prev Previous commit
Next Next commit
OHRM5X-1006: Develop time - project report API (orangehrm#1086)
  • Loading branch information
VageeshOrangeHRM authored Jan 13, 2022
commit 3fa466fe819cba309744a5fdf006e72ee380d8d2
16 changes: 13 additions & 3 deletions installer/dbscript/dbscript-2.sql
Original file line number Diff line number Diff line change
@@ -4263,7 +4263,9 @@ VALUES ('apiv2_time_time_sheet_config', 'API-v2 Time - Time Sheet Start Day Conf
('api_v2_time_copy_activities', 'API-v2 Time - Project Copy activities', 1, 1, 0, 0),
('apiv2_time_employee_timesheets', 'API-v2 Time - Employee Timesheets', 1, 1, 1, 0),
('apiv2_time_employee_timesheet_list', 'API-v2 Time - Employee Timesheet List', 1, 0, 0, 0),
('apiv2_time_default_timesheet', 'API-v2 Time - Default Timesheet', 1, 0, 0, 0);
('apiv2_time_default_timesheet', 'API-v2 Time - Default Timesheet', 1, 0, 0, 0),
('apiv2_time_reports', 'API-v2 Time - Reports', 1, 0, 0, 0),
('apiv2_time_reports_data', 'API-v2 Time - Reports Data', 1, 0, 0, 0);

SET @time_module_id := (SELECT `id` FROM ohrm_module WHERE name = 'time' LIMIT 1);

@@ -4285,6 +4287,8 @@ SET @api_v2_time_copy_activities_data_group_id := (SELECT `id` FROM ohrm_data_gr
SET @apiv2_time_employee_timesheets_data_group_id := (SELECT `id` FROM ohrm_data_group WHERE name = 'apiv2_time_employee_timesheets' LIMIT 1);
SET @apiv2_time_employee_timesheet_list_data_group_id := (SELECT `id` FROM ohrm_data_group WHERE name = 'apiv2_time_employee_timesheet_list' LIMIT 1);
SET @apiv2_time_default_timesheet_data_group_id := (SELECT `id` FROM ohrm_data_group WHERE name = 'apiv2_time_default_timesheet' LIMIT 1);
SET @apiv2_time_reports_data_group_id := (SELECT `id` FROM ohrm_data_group WHERE name = 'apiv2_time_reports' LIMIT 1);
SET @apiv2_time_reports_data_data_group_id := (SELECT `id` FROM ohrm_data_group WHERE name = 'apiv2_time_reports_data' LIMIT 1);

INSERT INTO ohrm_api_permission (`api_name`, `module_id`, `data_group_id`)
VALUES ('OrangeHRM\\Time\\Api\\TimeConfigPeriodAPI', @time_module_id, @apiv2_time_time_sheet_config_data_group_id),
@@ -4304,7 +4308,9 @@ VALUES ('OrangeHRM\\Time\\Api\\TimeConfigPeriodAPI', @time_module_id, @apiv2_tim
('OrangeHRM\\Time\\Api\\CopyProjectActivityAPI', @time_module_id, @api_v2_time_copy_activities_data_group_id),
('OrangeHRM\\Time\\Api\\EmployeeTimesheetAPI', @time_module_id, @apiv2_time_employee_timesheets_data_group_id),
('OrangeHRM\\Time\\Api\\EmployeeTimesheetListAPI', @time_module_id, @apiv2_time_employee_timesheet_list_data_group_id),
('OrangeHRM\\Time\\Api\\DefaultTimesheetAPI', @time_module_id, @apiv2_time_default_timesheet_data_group_id);
('OrangeHRM\\Time\\Api\\DefaultTimesheetAPI', @time_module_id, @apiv2_time_default_timesheet_data_group_id),
('OrangeHRM\\Time\\Api\\TimeReportAPI', @time_module_id, @apiv2_time_reports_data_group_id),
('OrangeHRM\\Time\\Api\\TimeReportDataAPI', @time_module_id, @apiv2_time_reports_data_data_group_id);

INSERT INTO ohrm_user_role_data_group (`can_read`, `can_create`, `can_update`, `can_delete`, `self`, `data_group_id`, `user_role_id`)
VALUES (1, 0, 1, 0, 0, @apiv2_time_time_sheet_config_data_group_id, @admin_role_id),
@@ -4343,7 +4349,11 @@ VALUES (1, 0, 1, 0, 0, @apiv2_time_time_sheet_config_data_group_id, @admin_role_
(1, 0, 0, 0, 0, @apiv2_time_employee_timesheet_list_data_group_id, @admin_role_id),
(1, 0, 0, 0, 0, @apiv2_time_employee_timesheet_list_data_group_id, @supervisor_role_id),
(1, 0, 0, 0, 0, @apiv2_time_default_timesheet_data_group_id, @admin_role_id),
(1, 0, 0, 0, 0, @apiv2_time_default_timesheet_data_group_id, @ess_role_id);
(1, 0, 0, 0, 0, @apiv2_time_default_timesheet_data_group_id, @ess_role_id),
(1, 0, 0, 0, 0, @apiv2_time_reports_data_group_id, @admin_role_id),
(1, 0, 0, 0, 0, @apiv2_time_reports_data_group_id, @project_admin_role_id),
(1, 0, 0, 0, 0, @apiv2_time_reports_data_data_group_id, @admin_role_id),
(1, 0, 0, 0, 0, @apiv2_time_reports_data_data_group_id, @project_admin_role_id);

UPDATE `ohrm_screen` SET `module_id`= 5 WHERE `action_url` = 'viewCustomers';
UPDATE `ohrm_screen` SET `module_id`= 5 WHERE `action_url` = 'viewProjects';
93 changes: 93 additions & 0 deletions symfony/plugins/orangehrmTimePlugin/Dao/ProjectDao.php
Original file line number Diff line number Diff line change
@@ -24,6 +24,8 @@
use OrangeHRM\Entity\ProjectAdmin;
use OrangeHRM\Entity\TimesheetItem;
use OrangeHRM\ORM\Paginator;
use OrangeHRM\ORM\QueryBuilderWrapper;
use OrangeHRM\Time\Dto\ProjectReportSearchFilterParams;
use OrangeHRM\Time\Dto\ProjectSearchFilterParams;

class ProjectDao extends BaseDao
@@ -212,4 +214,95 @@ public function hasTimesheetItemsForProject(int $projectId): bool
$qb->setParameter('projectId', $projectId);
return $this->getPaginator($qb)->count() > 0;
}

/**
* @param ProjectReportSearchFilterParams $projectReportSearchFilterParams
* @return array
*/
public function getProjectReportCriteriaList(
ProjectReportSearchFilterParams $projectReportSearchFilterParams
): array {
return $this->getProjectReportCriteriaPaginator($projectReportSearchFilterParams)->getQuery()->execute();
}

/**
* @param ProjectReportSearchFilterParams $projectReportSearchFilterParams
* @return int
*/
public function getProjectReportCriteriaListCount(
ProjectReportSearchFilterParams $projectReportSearchFilterParams
): int {
return $this->getProjectReportCriteriaPaginator($projectReportSearchFilterParams)->count();
}

/**
* @param ProjectReportSearchFilterParams $projectReportSearchFilterParams
* @return Paginator
*/
private function getProjectReportCriteriaPaginator(
ProjectReportSearchFilterParams $projectReportSearchFilterParams
): Paginator {
$q = $this->getProjectReportQueryBuilderWrapper($projectReportSearchFilterParams)->getQueryBuilder();
$q->select(
'projectActivity.id AS activityId,
projectActivity.name,
projectActivity.deleted AS deleted,
SUM(COALESCE(timesheetItem.duration, 0)) AS totalDuration'
);
$q->groupBy('projectActivity.id');

return $this->getPaginator($q);
}

/**
* @param ProjectReportSearchFilterParams $projectReportSearchFilterParams
* @return int
*/
public function getTotalDurationForProjectReport(
ProjectReportSearchFilterParams $projectReportSearchFilterParams
): int {
$q = $this->getProjectReportQueryBuilderWrapper($projectReportSearchFilterParams)->getQueryBuilder();
$q->select('SUM(COALESCE(timesheetItem.duration, 0)) AS totalDuration');
return $q->getQuery()->getSingleScalarResult() === null ? 0 : $q->getQuery()->getSingleScalarResult();
}

/**
* @param ProjectReportSearchFilterParams $projectReportSearchFilterParams
* @return QueryBuilderWrapper
*/
private function getProjectReportQueryBuilderWrapper(
ProjectReportSearchFilterParams $projectReportSearchFilterParams
): QueryBuilderWrapper {
$q = $this->createQueryBuilder(TimesheetItem::class, 'timesheetItem');
$q->leftJoin('timesheetItem.projectActivity', 'projectActivity');
$q->leftJoin('timesheetItem.timesheet', 'timesheet');
$this->setSortingAndPaginationParams($q, $projectReportSearchFilterParams);

if (!is_null($projectReportSearchFilterParams->getProjectId())) {
$q->andWhere('timesheetItem.project = :projectId');
$q->setParameter('projectId', $projectReportSearchFilterParams->getProjectId());
}

if (!is_null($projectReportSearchFilterParams->getFromDate()) && !is_null(
$projectReportSearchFilterParams->getToDate()
)) {
$q->andWhere($q->expr()->between('timesheetItem.date', ':fromDate', ':toDate'))
->setParameter('fromDate', $projectReportSearchFilterParams->getFromDate())
->setParameter('toDate', $projectReportSearchFilterParams->getToDate());
} elseif (!is_null($projectReportSearchFilterParams->getFromDate())) {
$q->andWhere($q->expr()->gte('timesheetItem.date', ':fromDate'))
->setParameter('fromDate', $projectReportSearchFilterParams->getFromDate());
} elseif (!is_null($projectReportSearchFilterParams->getToDate())) {
$q->andWhere($q->expr()->lte('timesheetItem.date', ':toDate'))
->setParameter('toDate', $projectReportSearchFilterParams->getToDate());
}

if ($projectReportSearchFilterParams->getIncludeApproveTimesheet(
) === ProjectReportSearchFilterParams::INCLUDE_TIMESHEET_ONLY_APPROVED) {
$q->andWhere('timesheet.state = :state');
$q->setParameter('state', ProjectReportSearchFilterParams::TIMESHEET_STATE_APPROVED);
}

return $this->getQueryBuilderWrapper($q);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?php
/**
* OrangeHRM is a comprehensive Human Resource Management (HRM) System that captures
* all the essential functionalities required for any enterprise.
* Copyright (C) 2006 OrangeHRM Inc., http://www.orangehrm.com
*
* OrangeHRM is free software; you can redistribute it and/or modify it under the terms of
* the GNU General Public License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* OrangeHRM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program;
* if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA
*/

namespace OrangeHRM\Time\Dto;

use OrangeHRM\Leave\Dto\DateRangeSearchFilterParams;

class ProjectReportSearchFilterParams extends DateRangeSearchFilterParams
{
public const ALLOWED_SORT_FIELDS = ['projectActivity.name'];

/**
* @var int|null
*/
private ?int $projectId = null;

public const INCLUDE_TIMESHEET_ALL = 'all';
public const INCLUDE_TIMESHEET_ONLY_APPROVED = 'onlyApproved';

public const INCLUDE_TIMESHEET = [
self::INCLUDE_TIMESHEET_ALL,
self::INCLUDE_TIMESHEET_ONLY_APPROVED,
];

public const TIMESHEET_STATE_APPROVED = "APPROVED";

/**
* @var string|null
*/
private ?string $includeApproveTimesheet = null;

public function __construct()
{
$this->setSortField('projectActivity.name');
}

/**
* @return int|null
*/
public function getProjectId(): ?int
{
return $this->projectId;
}

/**
* @param int|null $projectId
*/
public function setProjectId(?int $projectId): void
{
$this->projectId = $projectId;
}

/**
* @return string|null
*/
public function getIncludeApproveTimesheet(): ?string
{
return $this->includeApproveTimesheet;
}

/**
* @param string|null $includeApproveTimesheet
*/
public function setIncludeApproveTimesheet(?string $includeApproveTimesheet): void
{
$this->includeApproveTimesheet = $includeApproveTimesheet;
}
}
Loading