Commit Graph

510 Commits (561428ee62ff71a5dcddd388cd0acc6352b315b8)

Author SHA1 Message Date
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
ashwaq a670c06790 fix design 6 years ago
ashwaq e6642a29e8 fix conflit 6 years ago
Mohamed Mekawy a6fe8c183a merdge dashbored services to new design 6 years ago
Mohamed Mekawy 213648a9ed Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into Dashbored 6 years ago
ashwaq 335758fbd0 add login design 6 years ago
umasoodch fd663493e6 fixed plugin firebase issue 6 years ago
umasoodch 338205b305 Removed onw signal and added firebasex plugin 6 years ago
umasoodch 4c5153c69d Merge branch 'master' into firebasex 6 years ago
ashwaq bdab18c114 fix infiniteScroll payslip 6 years ago
ashwaq 8a4ab39623 fix infiniteScroll 6 years ago
ashwaq 1d9652ca4c Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
ashwaq 31a3b0a823 fix my team load more 6 years ago
umasoodch 9218d02195 Merge branch 'master' into firebasex
# Conflicts:
#	Mohem/package.json
6 years ago
umasoodch 3c637df2d5 Merge branch 'master' into timecard 6 years ago
umasoodch 5c7a30f308 added firebase token instead of one signal 6 years ago
umasoodch 8dc3f5a57e Merge branch 'master' into timecard
# Conflicts:
#	Mohem/src/theme/styles.scss
6 years ago
umasoodch 976961e9ee completed time card module 6 years ago
Fatimah.Alshammari 13df9b7b75 add dachboard services 6 years ago
Fatimah.Alshammari d5407c8f90 add dachboard services 6 years ago
ashwaq 7456ab6e0a add dashbored services 6 years ago
ashwaq 4bdc08b42d add dashbored 6 years ago
Mohamed Mekawy 02e618c8bd Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
Mohamed Mekawy 1555ad5c91 edit change password page 6 years ago
ashwaq 10458f2e0f fix page P_PAGE_LIMIT 6 years ago
ashwaq 53746fc95f add infinite Scroll 6 years ago
umasoodch e01c73a092 completed functionality of time card module 6 years ago
Mohamed Mekawy 15b317b5ed call payslip on init 6 years ago
umasoodch 167973cedb added time card detail and its summary 6 years ago
ashwaq ee7ac90c18 fix conflict 6 years ago
ashwaq b02743ead1 PO+MO+PR+Payslip+customAccordin 6 years ago
Mohamed Mekawy ba0d53011b Add Time card & Edit date element & change icons 6 years ago
Mohamed Mekawy 2a1ca91daa OpenPayslip from dashboard 6 years ago
ashwaq fefdc5b8c3 PR no data 6 years ago
ashwaq 6407421ccd Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
ashwaq a8457cc11e PR fix design 6 years ago
Mohamed Mekawy e59db729a7 Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
Mohamed Mekawy 6d99285451 handle build error by removin backgroud location plugin 6 years ago
ashwaq 594a67cc96 fix Error 6 years ago
ashwaq 20de05a7b4 PR Part 2 6 years ago
ashwaq 524b29193a Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
ashwaq d09d251c71 PR Worklist 6 years ago
Mohamed Mekawy 5c4377034f enhance 6 years ago
Mohamed Mekawy c9e7e5a851 general enhancments 6 years ago
Ashwaq Hasan Jaafar 0b4a7090ae fix `Finger/FaceID login 6 years ago
enadhilal 0d05073e71 push Enad code workList page 6 years ago
enadhilal 22f9a0ac56 update on workList page 6 years ago
ashwaq 8cc0a3fff7 fix device token issue 6 years ago
ashwaq 4ae7e7566c add oneSignal plugin in install-plugins.bat 6 years ago
ashwaq 2a75920565 Confirm Login by SMS,Whatsapp,fingerprint and faceID 6 years ago
Mohamed Mekawy 7f8a37897c Add Time card Module 6 years ago
ashwaq 53fe3813b0 Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
ashwaq 061c740c55 Add payslip + Fix vacation rule 6 years ago
Mohamed Mekawy 7046c7fa43 edit my team & erp issues 6 years ago
Mohamed Mekawy 17246a58b8 add PO & MO & PR 6 years ago
ashwaq d9726a2f46 fix profile image design 6 years ago
ashwaq 1db1a031ba fix conflict 6 years ago
ashwaq a9be864dc3 add plugins to install-plugins 6 years ago
ashwaq c52ee53b99 change profile Image 6 years ago
Mohamed Mekawy 2d03ed75f3 clean projest &will start phase 2 6 years ago
Mohamed Mekawy 2117526e5f my team enhancment 6 years ago
mohamed.mekawy ad56814966 fix notification & home 6 years ago
mohamed.mekawy 492eb5d912 edit Icon 6 years ago
haroon amjad 9b35e22a98 new Al Habib Mohemm App 6 years ago
haroon amjad 8b6259723f Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
#	Mohem/package.json
6 years ago
haroon amjad 7288c37bcb no message 6 years ago
mohamed.mekawy 7034aef571 add barcode scanner 6 years ago
mohamed.mekawy ce88e72248 solve bugs 6 years ago
haroon amjad 8915e67b00 fixes 6 years ago
Sultan Khan 32b9ce319c Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
#	Mohem/src/app/app.scss
#	Mohem/src/app/home/home.page.scss
#	Mohem/src/app/my-team/details/details.component.html
#	Mohem/src/app/my-team/home/home.component.html
6 years ago
Sultan Khan 10d9533c4b css updates 6 years ago
haroon amjad e15574f1a2 style changes 6 years ago
haroon amjad 85d28fc27f My Specialist Issue Resolved 6 years ago
haroon amjad a4d0efe6c0 Styling changes & improvements 6 years ago
haroon amjad 312556c035 font style added to app 6 years ago
Sultan Khan f21be03b02 specialist page update 6 years ago
haroon amjad 985a9a31a7 styling added 6 years ago
haroon amjad 22a11a3214 My Subordinate Page implemented 6 years ago
haroon amjad ae42645e6a My Specialist Page added to Home Page 6 years ago
haroon amjad 7af8b9c791 My Specialist Page Implemented 6 years ago
haroon amjad 0023dd3ad8 Work list replacement roll fixes 6 years ago
Sultan Khan 9020253679 Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
Sultan Khan 3327ad4d29 notification added 6 years ago
haroon amjad 57cf330cef EIT Update List page implemented 6 years ago
haroon amjad 31af06d2c9 Worklist Main Page Changes 6 years ago
Sultan Khan a87afe1d8e worklist main page update 6 years ago
Sultan Khan faad878c87 worklist main page added 6 years ago
haroon amjad 6f889347e4 Work List Pages Completed 6 years ago
haroon amjad 61275a4c85 View Note Modal, Work List RFC & View Replacement Modal Implemented 6 years ago
haroon amjad f07de65e5c work list replacement component implemented 6 years ago
haroon amjad 20b8ef5693 Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
haroon amjad 7f03817a38 EIT Forms Bug Fixing 6 years ago
Sultan Khan fe054b8ab6 worklist-main 6 years ago
Sultan Khan 16e26719f0 worklist-main added 6 years ago
haroon amjad a2511c41ce Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
haroon amjad 7fe2bef41e EIT Form fixes ongoing 6 years ago
Sultan Khan 8b5436ced6 notification page 6 years ago
Sultan Khan ef0c8a7b8a absence update 6 years ago
haroon amjad 08f588c302 EIT Flow completed 6 years ago
haroon amjad 84643553bf Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
#	Mohem/src/app/hmg-common/services/common/common.service.ts
#	Mohem/src/app/uI-elements/select.input.ts
6 years ago
haroon amjad 700d871dca EIT Forms implementation In-Progress 6 years ago