Commit Graph

510 Commits (561428ee62ff71a5dcddd388cd0acc6352b315b8)

Author SHA1 Message Date
umasoodch bcf8443157 fixed header issue in application 6 years ago
Mohamed Mekawy 7d8927c1cf merge master-newdesign 6 years ago
Mohamed Mekawy a3300453d9 merge master-newdesign 6 years ago
Mohamed Mekawy 871777d181 merge ashwaq-fix-bug 6 years ago
Mohamed Mekawy 25799a7c78 merge master-newdesign 6 years ago
Mohamed Mekawy e191b21e44 fix issues 6 years ago
enadhilal 0538917989 fixing btn plus 6 years ago
Fatimah.Alshammari 0a0c583053 fix bugs 6 years ago
enadhilal 02be9dbbe6 btn on absence 6 years ago
enadhilal ec609c57ea btn on EIT 6 years ago
ashwaq d4ef8bf7ec fix po attachment + Mo Action 6 years ago
umasoodch 4aea82cf7c discard unwanted folders 6 years ago
enadhilal 7c4d3327d6 fixing menu and scrolling in EIT 6 years ago
Fatimah.Alshammari 35781357d3 merge master-newdesign 6 years ago
umasoodch d31b76bc44 fixed all issues while making prod build 6 years ago
Fatimah.Alshammari 043b57383b edit issues 6 years ago
ashwaq c7eb6c97a2 fix merge ashwaq issue + work-list branch 6 years ago
ashwaq a0e265ba55 fix merge 6 years ago
ashwaq 18f54941ee fix update/continue notification + action name 6 years ago
ashwaq 1b875b8bc4 fix replacment inif 6 years ago
Fatimah.Alshammari 7c17cb0913 add fix bug 6 years ago
umasoodch 4e3d0b0298 fixed minor issues of worklist 6 years ago
Salman Afzal 38ebbec6f1 fixed loading issues 6 years ago
umasoodch 7f32c91f5c fixed loading issue at worklist 6 years ago
ashwaq 47054eca84 fix vacation-rule issue 6 years ago
umasoodch 270506a31c fixed multiple popup issues 6 years ago
umasoodch bf317e7274 fixed merged issues with master-newdesign 6 years ago
umasoodch e7d476fc2e fixed MM-139 MM-134 MM-123 MM-47 6 years ago
Mohamed Mekawy 5ffde37c48 merge master-newdesign 6 years ago
umasoodch 6db87b6930 fixed issue MM-46 6 years ago
umasoodch fcbeae462e fixed MM-134 6 years ago
ashwaq 30bfa05c2d fix MO item History 6 years ago
ashwaq 5aeab4b08c add MO item History 6 years ago
umasoodch b3fae94a1c MM-96
MM-95 issues fixed
6 years ago
Mohamed Mekawy 04e35853a5 edit addClass 6 years ago
enadhilal ff40266c6e add all for ITG 6 years ago
Mohamed Mekawy bca40eef6d edit add icon 6 years ago
Mohamed Mekawy 0c0cffb75e edit payslip 6 years ago
enadhilal 8c1b6dce0e add all for ITG 6 years ago
Mohamed Mekawy 8d4bf43fb0 merge master-newdesign 6 years ago
ashwaq 2397fc1482 fix bug 6 years ago
umasoodch 14d7419b91 rsolved conflicts 6 years ago
umasoodch ab2ace51b9 MM-112 FIXED - worklist and home loader issue resolved 6 years ago
Fatimah.Alshammari 4f7c11ba49 edit arabic work-list 6 years ago
Fatimah.Alshammari 821811c8e2 edit worklist main page 6 years ago
Fatimah.Alshammari a18c30eaa5 general enhancments 6 years ago
umasoodch cb67e2670a issues resolved 6 years ago
ashwaq 021e53da26 fix worlist 6 years ago
ashwaq ffc298d123 fix conflict worlist 6 years ago
umasoodch 470e1c7d8e fixed worklist issues 6 years ago
ashwaq 66795daf5e add missing files 6 years ago
umasoodch d6dc300cf6 Merge branch 'master-newdesign' into work-list 6 years ago
umasoodch 9c9b85db3c fixed count issue 6 years ago
Mohamed Mekawy 88e7f106bf merge master-newdesign 6 years ago
Mohamed Mekawy 289e5f1452 enhance login 6 years ago
Mohamed Mekawy 97525a2854 Merge branch 'master-newdesign' into my-requests 6 years ago
Mohamed Mekawy 3651f5a04a edit math floor 6 years ago
Fatimah.Alshammari 0052bb98ff merge master-newdesign 6 years ago
ashwaq 9d4bd2f592 fix login conflict 6 years ago
ashwaq 14e2654ae4 fix login 6 years ago
Mohamed Mekawy 5f24329ef9 orienttion 6 years ago
ashwaq 929844d1ef fix worklist issue 6 years ago
Fatimah.Alshammari 0871a67480 all conflicting issues are resolved 6 years ago
Fatimah.Alshammari dc1749e48e edit performance appraisal 6 years ago
Fatimah.Alshammari 80ab9a5c80 general 6 years ago
umasoodch b9f22f4eef Merge branch 'master-newdesign' into work-list 6 years ago
umasoodch 68357f35b2 fixed worklist flow 6 years ago
Mohamed Mekawy 215084f797 edit payment info & employee profile update 6 years ago
enadhilal 8d1ad091e9 add image and fix text and chaneg the BG color for any page did not have data 6 years ago
Mohamed Mekawy f00e63f49d remove image from confirmlogin and sms 6 years ago
Fatimah.Alshammari d2843a8a86 Merge branch 'arabic-version' of https://hmg.git.cloudforge.com/mohemmionic5 into arabic-version 6 years ago
Fatimah.Alshammari 7a30805e71 add arabic version + fix bugs 6 years ago
enadhilal 11dd7e56e4 fix profile in arabic and translate 6 years ago
umasoodch 717323b9ed Merge branch 'master-newdesign' into work-list 6 years ago
umasoodch d26cea9024 fixed attendance and calendar issues 6 years ago
umasoodch 98eae4cc7f Merge branch 'master-newdesign' into myteam 6 years ago
umasoodch 536e8a9c5a handled multiple shifts and added slider. 6 years ago
Mohamed Mekawy c6409c4620 Merge branch 'home' into master-newdesign 6 years ago
enadhilal f82ac02174 Merge branch 'arabic-version' of https://hmg.git.cloudforge.com/mohemmionic5 into arabic-version 6 years ago
enadhilal 10ec3c4ec8 fixing payslip in arabic version 6 years ago
Mohamed Mekawy 8f9ef27ee1 add my team to side menu & handle accural balance in absence page 6 years ago
Fatimah.Alshammari 25826f900d header translate and quick walkthrouh to test design and translate 6 years ago
ashwaq 927bfbace5 Merge branch 'work-list' of https://hmg.git.cloudforge.com/mohemmionic5 into work-list 6 years ago
ashwaq 85a5087b44 fix worklist 6 years ago
ashwaq 4a0ca75f6d fix login 6 years ago
enadhilal 3eb8914986 Merge branch 'arabic-version' of https://hmg.git.cloudforge.com/mohemmionic5 into arabic-version 6 years ago
enadhilal 785538983f adding translate and fixing desgin in worklist and myleave and ticket request 6 years ago
Fatimah.Alshammari 43bc72b9b8 update translate and fix design 6 years ago
Fatimah.Alshammari 5421842188 add pull 6 years ago
Mohamed Mekawy 0928d55171 edit home last login way 6 years ago
Fatimah.Alshammari 79feab44e3 design dynamic form and translate 6 years ago
Mohamed Mekawy cceb434cf4 merge master-newdesign 6 years ago
Mohamed Mekawy afed126eaf edit my team icon 6 years ago
enadhilal 3740606bd2 add translate and fix design in Home, worklist, myLeave and Ticket Request 6 years ago
Mohamed Mekawy 024ed04baf merge master-newdesign 6 years ago
Mohamed Mekawy b0b76cd5e0 add vacation rule icon 6 years ago
umasoodch 1aa290f627 fixed attendance issue 6 years ago
Mohamed Mekawy ae3a2e4995 merge master-newdesign 6 years ago
umasoodch f1157f48f6 fixed timecard module 6 years ago
Mohamed Mekawy 5557f7d3ba add vacation rule to service list 6 years ago
Mohamed Mekawy 8c55d3995a edit time input 6 years ago
Mohamed Mekawy c3339148ed fix my team request for employee list 6 years ago
Mohamed Mekawy 1f044cfb3e Merge branch 'master-newdesign' into work-list 6 years ago
Mohamed Mekawy 5d41967ed7 edit login token 6 years ago
umasoodch 7ed63baf68 added myteam navigation 6 years ago
umasoodch 561db9109f Merge branch 'master-newdesign' into myteam
# Conflicts:
#	Mohem/package-lock.json
#	Mohem/package.json
#	Mohem/src/app/eit/home/home.component.html
#	Mohem/src/app/hmg-common/hmg-common.module.ts
#	Mohem/src/app/home/home.page.ts
#	Mohem/src/app/notification/home/home.component.html
#	Mohem/src/theme/styles.scss
6 years ago
ashwaq fee59fb259 fix 6 years ago
ashwaq a4ad4e9d49 fix static value 6 years ago
ashwaq e7e9ec7b63 fix conflict 6 years ago
ashwaq 527ee02627 add get login last info 6 years ago
Mohamed Mekawy dd7cf45685 edit design 6 years ago
umasoodch 69ea2637d6 my-team attendance issues resolved 6 years ago
Mohamed Mekawy f781cd8eae Merge branch 'master-newdesign' into accural-balance 6 years ago
Mohamed Mekawy a694396f82 add click to status button & add icon to service buttons & fix issues 6 years ago
enadhilal 36c4bf322b add translate for header and fix the position back arrow in arabic version 6 years ago
Fatimah.Alshammari c1e72539de edit ticketbalance &absense home &payslip header 6 years ago
Mohamed Mekawy 08c8ea71b1 Merge branch 'master-newdesign' into home 6 years ago
Mohamed Mekawy 05387d81d4 merge master-newdesign 6 years ago
Mohamed Mekawy 70fd9e5ebc edit ticket balance design 6 years ago
Mohamed Mekawy 5fcde27564 merge master-newdesign 6 years ago
Fatimah.Alshammari d2940a70d0 add ticket balance 6 years ago
Mohamed Mekawy c37d469ea7 add new design for EIT & Absence subpage 6 years ago
ashwaq 18dabcb13e add vacation rule 6 years ago
enadhilal 1f50906684 make segment active when first open & fixing skip function 6 years ago
Fatimah.Alshammari e71dd383da finish leave balance chart 6 years ago
umasoodch bf825662a9 fixed attendance tracking and removed unnecessary code 6 years ago
Mohamed Mekawy d1d3a307b7 finish replacement modal 6 years ago
umasoodch 05ea5e349f fixed tslint issues 6 years ago
umasoodch 8f83946c48 Merge branch 'itg-new-design' into work-list
# Conflicts:
#	Mohem/src/app/notification/home/home.component.html
#	Mohem/src/app/notification/home/home.component.scss
#	Mohem/src/app/notification/home/home.component.ts
6 years ago
umasoodch 0e17984b20 fixed conflict issues 6 years ago
umasoodch 14e1c27591 added item-type in search 6 years ago
Fatimah.Alshammari e37311f726 edit translation 6 years ago
Mohamed Mekawy 6385c93e56 edit background color 6 years ago
Mohamed Mekawy e3cdfa31eb finish submit absence request 6 years ago
Mohamed Mekawy 721066c859 finish absence history page 6 years ago
Mohamed Mekawy 69db29931f finish absence confirmation page & add absence submit modal 6 years ago
Mohamed Mekawy 2ee9d51f7e finish Eit new design 6 years ago
enadhilal a3109bc0a8 create and design ITG form 6 years ago
Mohamed Mekawy 4d6167d6e8 finish confirmation page 6 years ago
umasoodch 55f5b391e1 Merge branch 'new-time-card' into myteam 6 years ago
umasoodch 7ecc3e5048 removed unnecessary code 6 years ago
Fatimah.Alshammari 573941941f edit monthly attendance 6 years ago
umasoodch a78477c192 fixed attendance tracking issue 6 years ago
Mohamed Mekawy c85a5ef82a design confirmation page 6 years ago
Mohamed Mekawy 2b5265243e add history&RequestPage 6 years ago
umasoodch a9128c93e2 completed my-team 6 years ago
umasoodch 4bf4d4fc24 fixed merging conflicts 6 years ago
enadhilal b27f976bc9 push to merge with worklist work 6 years ago
Fatimah.Alshammari 32e33e655b edit style 6 years ago
umasoodch 7406d6f990 completed my-team except attendance one 6 years ago
Fatimah.Alshammari 2a71811ca2 edit monthley attendance 6 years ago
ashwaq 2c5c0599d8 fix conflict worklist 6 years ago
ashwaq 93f973022c fix conflict 6 years ago
ashwaq 838e7cf99b add worklist+ fix conflict 6 years ago
ashwaq eb9413edb9 add worklist fix conflict 6 years ago
ashwaq ece6e45d97 add worklist new design 6 years ago
umasoodch 93e59d2618 added about data for team member 6 years ago
umasoodch 6eeca7479d my team new design componentes created 6 years ago
umasoodch 5208584999 added worklist filters logic 6 years ago
enadhilal 2f55272c91 new-time-card 6 years ago
umasoodch 96971a6b68 resolved conflict issues with master branch 6 years ago
umasoodch 09afc19dbb fixed multiple swipe alert issue 6 years ago
Mohamed Mekawy f316629cb0 merge master-newdesign branch 6 years ago
Mohamed Mekawy 396241bc83 merge emp-profile branch 6 years ago
umasoodch 7bd0701d75 fixed design issues for attendance tracking 6 years ago
Fatimah.Alshammari afc8c99639 add new design to payslip 6 years ago
umasoodch 9177721b59 completed worklist task 6 years ago
Mohamed Mekawy 52d9e04dac merge master-newdesign with emp-profile 6 years ago
enadhilal a2acf0dcbd update monthly-attendance 6 years ago
Mohamed Mekawy 594e875156 add open time card function 6 years ago
Mohamed Mekawy a09bac4b6e Merge remote-tracking branch 'origin/timecard' into new-time-card 6 years ago
Fatimah.Alshammari b9e1a95601 Add new profile page & years of experience & Performance appraisal 6 years ago
enadhilal f3fdc1454f monthly-attendance design 6 years ago
umasoodch d2fac5c4d5 added header for worklist 6 years ago
umasoodch e629aab07a merged and fixed all the conflicting issues and also removed unnecessary code 6 years ago
umasoodch 86e96c11d0 added search modal and its CSS 6 years ago
umasoodch 2e6dd95004 completed work list ui part 6 years ago
umasoodch f7002f3eae completed dashboard and attendance timer work 6 years ago
umasoodch ecbdf62c74 merged and resolved conflicts 6 years ago
umasoodch dcf6bd5d79 no message 6 years ago
ashwaq 9b58f9e9e0 add 6 years ago
ashwaq 4fe49bdb18 add attend scan service + fix design alert 6 years ago
umasoodch 884e518971 Merge branch 'master-newdesign' into home
# Conflicts:
#	Mohem/src/app/hmg-common/hmg-common.module.ts
6 years ago
umasoodch d1fbd34330 added logic for attendance 6 years ago
ashwaq 6d3dd907a6 fix attend-tracking 6 years ago
ashwaq 81504b0491 fix merge conflit 6 years ago
ashwaq 5df30f114b add attend-tracking 6 years ago
Mohamed Mekawy 5b7e435a31 fix login type issue 6 years ago
umasoodch a8f9640f68 added remaining services for dashboard 6 years ago
umasoodch ffc3bca0a6 added navigation at home page 6 years ago
umasoodch c7decd88a0 fixed home ts file 6 years ago
umasoodch 1c62b10486 merged master-newdesign with home branch and resolved all conflicts 6 years ago
umasoodch 11432b633e timer added according to the shift hours 6 years ago
umasoodch c955a19ae8 pushed timer code 6 years ago
ashwaq c069ae5282 Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into login 6 years ago
ashwaq f23d6e7bf4 fix login localstorge 6 years ago
Fatimah.Alshammari ab30d50808 Merge branch 'master-newdesign' into side-menu 6 years ago
Fatimah.Alshammari cb1aad91f9 edit side menue new design 6 years ago
ashwaq 7779a2ed61 fix conflict 6 years ago
Mohamed Mekawy e90be39807 edit code 6 years ago