Skip to content

Want to pull changes to my branch #22

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.

Sign up for GitHub

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

Jump to bottom
Open
SharifEhab wants to merge 89 commits into
base: New_branch
Choose a base branch
from
Open

Want to pull changes to my branch #22

SharifEhab wants to merge 89 commits into from

Conversation

@SharifEhab
Copy link
Collaborator

@SharifEhab SharifEhab commented Jan 3, 2023

Want to pull changes to my branch

mariamgamal70 and others added 30 commits January 2, 2023 22:46
@mariamgamal70
edits in app and patientlabandscans html
bcbb2ca 
app-> finished route patientlabsandscans post and get
html-> changed some checkbox to type radio , removed request and kept add only
@NadaAlfowey
backend installed
64c855d
@SharifEhab
Merge pull request #19 from mariamgamal70/New_branch
bb0a7ca 
New SQLSCRIPT
@hassanelsheikh
Update patientrecord_doctor.html
2750b95 
ff
@NadaAlfowey
backends1
1b2c989
@NadaAlfowey
Merge branch 'main' into nada
bba8fc4
@NadaAlfowey
backend2
c890443
admin payment
cc06923
Merge branch 'main' of https://github.com/mariamgamal70/ICU-Managemen…
641f513 
…t-System
@NadaAlfowey
edit2
06cd3bb
@NadaAlfowey
age*
62eca64
@hassanelsheikh
Merge branch 'main' into hassan
fc08bce
@mariamgamal70
app update, adjustments in html files to match app
9a40c9c
@mariamgamal70
Merge pull request #20 from mariamgamal70/nada
9f45ee2 
Nada
@mariamgamal70
summary
2c95679 
adjusted prescriptiontable and prescriptionchecklist, added global render function to count notificatiion in app
changed name of html page  from notifications to nursenotifications
adjusted prescriptionchecklist and notification  jinja
@mariamgamal70
Merge branch 'app-nurse-branch'
201d0b9
@mariamgamal70
merged my branch of nurse
3becd4d
@hassanelsheikh
safa
35197b1
@mariamgamal70
commented function of age to use mysql age
9afa4f3
@mariamgamal70
sharif's admin app update
6b3adf9
@SharifEhab
AdminChanges
dac7085
@SharifEhab
Merge pull request #23 from mariamgamal70/Sharif_NEW_BRANCH
f162c91 
AdminChanges
@SharifEhab
NEW_SQL_SCRIPT
e0ef808
@SharifEhab
Merge pull request #24 from mariamgamal70/Sharif_NEW_BRANCH
8df2ec3 
NEW_SQL_SCRIPT
@mariamgamal70
completed nursehome
cd70d07
@NadaAlfowey
integration+backend almost done
c10f8de
@NadaAlfowey
Merge branch 'main' into nada
1c4873c
@SharifEhab
AdminDrUpdate
ce30e67
@SharifEhab
Merge pull request #26 from mariamgamal70/main
1659d3e 
Merge main into sharifbranch
@SharifEhab
Merge pull request #27 from mariamgamal70/Sharif_NEW_BRANCH
a0e7e84 
AdminUpdate
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@SharifEhab @mariamgamal70 @NadaAlfowey @hassanelsheikh