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

Touch up #476

Open
wants to merge 91 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
6fbaf58
create counselor page
May 1, 2024
c493b29
add patient folder, edit dashboard and icon
httpmisheru May 1, 2024
e270f4e
add medical history to index file and change title for appointment page
httpmisheru May 2, 2024
c74e247
made changes on appointment, dashboard and view payment bill features
httpmisheru May 3, 2024
c7e2b03
change sidebar link and change card contents in index.html
httpmisheru May 3, 2024
b97edda
made changes in cards (index.html) and appointment(view upcoming and …
httpmisheru May 3, 2024
d37c991
update counselor
May 4, 2024
bc02d7b
Updated admin part
pelajardekan May 4, 2024
5936b89
Change appointment.html
pelajardekan May 4, 2024
1066334
change index.html -> login.html
May 4, 2024
cc31bf6
update appointment list
May 4, 2024
75ea395
update patient list
May 4, 2024
80ffd15
add mini calendar on appointment.html
pelajardekan May 4, 2024
3bf30bf
add dashboard edit modal
May 4, 2024
8f92829
add upcoming and past appointment page
May 4, 2024
0a93aa3
add pop up modal for upcoming appointment page
May 4, 2024
93f55be
initial step for modal medical history at patient list
May 4, 2024
88b789a
made feature changes to patient side
httpmisheru May 4, 2024
3d0b109
Merge pull request #1 from ahmadiman547/feature03-patientFeatures
ahmadiman547 May 5, 2024
5ea56b3
update counselor
May 4, 2024
a4ada0d
change index.html -> login.html
May 4, 2024
815e134
update appointment list
May 4, 2024
f598cf1
update patient list
May 4, 2024
b5548a2
add dashboard edit modal
May 4, 2024
292f268
add upcoming and past appointment page
May 4, 2024
3936e99
add pop up modal for upcoming appointment page
May 4, 2024
cc7968d
initial step for modal medical history at patient list
May 4, 2024
05b30ec
add profile page
May 5, 2024
09ef70b
Merge origin/counselor into counselor
May 5, 2024
5d540d2
update index
May 5, 2024
0080cd2
made feature changes on appointment and index.html
httpmisheru May 5, 2024
3cd3732
Merge pull request #2 from ahmadiman547/feature03.2-addEditApp
ahmadiman547 May 5, 2024
e513673
add template home
May 6, 2024
1474595
add template home
May 6, 2024
5ec6cb7
Merge pull request #3 from ahmadiman547/counselor
ahmadiman547 May 6, 2024
06e8e2c
add template home - repair
May 6, 2024
fcb48f6
update home page
May 7, 2024
7af9b2c
Merge pull request #4 from ahmadiman547/counselor
ahmadiman547 May 8, 2024
30885af
made feature changes on index.html, css files, change background img …
httpmisheru May 8, 2024
131b1d8
add register patient (problem for select gender part)
httpmisheru May 8, 2024
da3fe14
Updated admin part
pelajardekan May 4, 2024
dd31b93
Change appointment.html
pelajardekan May 4, 2024
7a88240
add mini calendar on appointment.html
pelajardekan May 4, 2024
f6c5e02
erase test.html
pelajardekan May 9, 2024
579be67
Merge origin/Admin into Admin
pelajardekan May 9, 2024
321b6a8
make collapsable menu for appointment stay
May 9, 2024
5b95f3c
Update Admin features
pelajardekan May 9, 2024
03bf12f
update counselor
May 9, 2024
6449fae
Update Admin features
pelajardekan May 9, 2024
46c1b1a
edit select dropdown ui
httpmisheru May 9, 2024
c37e5e5
Merge pull request #5 from ahmadiman547/feature04-addRegisterPage
httpmisheru May 9, 2024
f55b250
Update Admin features
pelajardekan May 9, 2024
523574b
update counselor
May 9, 2024
209d253
update counselor
May 9, 2024
89f6d28
add action edit to med history
May 9, 2024
a3fe453
Merge pull request #6 from ahmadiman547/counselor
ahmadiman547 May 9, 2024
0b3f3db
Update Admin features
pelajardekan May 9, 2024
1a86548
Merge origin/master into Admin
pelajardekan May 9, 2024
c6c368f
Update README.md
pelajardekan May 9, 2024
2683397
Update README.md
pelajardekan May 9, 2024
3ef60df
Update README.md
pelajardekan May 9, 2024
86dfe32
Update README.md
pelajardekan May 9, 2024
b7da1d0
Update Admin features
pelajardekan May 9, 2024
c5d1fc5
made changes on patient side
httpmisheru May 9, 2024
73a4fa6
made changes on patient sidebar
httpmisheru May 9, 2024
d8dba97
made changes on patient sidebar
httpmisheru May 9, 2024
e0bb166
Merge pull request #7 from ahmadiman547/feature05/changeFeatures
httpmisheru May 9, 2024
cd3dacf
add patient
May 9, 2024
b1cc16f
Merge pull request #8 from ahmadiman547/counselor
ahmadiman547 May 9, 2024
9ff949d
Update README.md
pelajardekan May 9, 2024
d4a5c12
Update Admin features
pelajardekan May 9, 2024
cd735f0
Update README.md
pelajardekan May 10, 2024
0d54151
Merge origin/master into Admin
pelajardekan May 10, 2024
58a1bb9
A lot of update for tocuh up the interface design...LET'S GOOOOOOO !
May 10, 2024
8b36f4f
Merge pull request #9 from ahmadiman547/counselor
ahmadiman547 May 10, 2024
14ac26b
Merge origin/master into Admin
pelajardekan May 10, 2024
e05eb48
update admin features
pelajardekan May 10, 2024
f0b64d7
update admin features
pelajardekan May 10, 2024
27843e1
update admin features
pelajardekan May 10, 2024
e7e02bd
update admin features
pelajardekan May 10, 2024
beafb89
Update patient and counselor ui
May 10, 2024
da3eb5f
Merge pull request #10 from ahmadiman547/patient-UI-sync
ahmadiman547 May 10, 2024
010741b
Update README.md
pelajardekan May 10, 2024
662e21f
update admin features
pelajardekan May 10, 2024
563a6f9
update admin features
pelajardekan May 10, 2024
12ae860
add back button to view medical history
May 10, 2024
a12fa2c
add back button to view medical history
May 10, 2024
fdfb00c
Merge pull request #11 from ahmadiman547/counselor
ahmadiman547 May 10, 2024
854e6b0
update admin features
pelajardekan May 10, 2024
d75e842
Merge pull request #12 from ahmadiman547/Admin
pelajardekan May 10, 2024
adaba6e
Touch up every features
pelajardekan May 10, 2024
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
update appointment list
ahmad authored and ahmad committed May 5, 2024
commit 815e13430e427f78d54ad4dbbc049e2ea3c912ad
74 changes: 33 additions & 41 deletions counselor/appointment.html
Original file line number Diff line number Diff line change
@@ -219,47 +219,26 @@ <h5 class="modal-title" id="exampleModalLongTitle">Create new appointment</h5>
<table class="table table-bordered" id="dataTable" width="100%" cellspacing="0">
<thead>
<tr>
<th>Patient</th>
<th>No</th>
<th>Appointment ID</th>
<th>Date</th>
<th>Room</th>
<th>Time</th>
<th>Room</th>
<th>Patient</th>
<th></th>
<th></th>

</tr>
</thead>

<tbody>
<tr>
<td>Tiger Nixon</td>
<td>25/5/2024</td>
<td>A03</td>
<td>8.30am - 10.00am</td>
<td>
<button type="button" class="btn btn-danger" data-toggle="modal" data-target="#example2ModalCenter">
Delete
</button>
<!-- Modal -->
<div class="modal fade" id="exampleModalCenter" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="example2ModalLongTitle">Delete</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
...
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div>
</div>
</div>
</div>

</td>
<td>01</td>
<td>TBD</td>
<td>25-05-2024</td>
<td>8.00 a.m.</td>
<td>A01</td>
<td>Richard Nixon</td>

<td>
<button type="button" class="btn btn-warning" data-toggle="modal" data-target="#example2ModalCenter">
Edit
@@ -287,20 +266,24 @@ <h5 class="modal-title" id="example2ModalLongTitle">Edit</h5>
</td>
</tr>
<tr>
<td>Garrett Winters</td>
<td>30/5/2024</td>
<td>A04</td>
<td>8.30am - 10.00am</td>
<td>02</td>
<td>TBD</td>
<td>25-05-2024</td>
<td>8.00 a.m.</td>
<td>A02</td>
<td>Betelguese Contee</td>


<td>
<button type="button" class="btn btn-danger" data-toggle="modal" data-target="#example2ModalCenter">
Delete
<button type="button" class="btn btn-warning" data-toggle="modal" data-target="#example2ModalCenter">
Edit
</button>
<!-- Modal -->
<div class="modal fade" id="exampleModalCenter" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="example2ModalLongTitle">Delete</h5>
<h5 class="modal-title" id="example2ModalLongTitle">Edit</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
@@ -315,8 +298,17 @@ <h5 class="modal-title" id="example2ModalLongTitle">Delete</h5>
</div>
</div>
</div>

</td>
</tr>
<tr>
<td>03</td>
<td>TBD</td>
<td>25-05-2024</td>
<td>8.00 a.m.</td>
<td>A03</td>
<td>Regulus Corneas</td>


<td>
<button type="button" class="btn btn-warning" data-toggle="modal" data-target="#example2ModalCenter">
Edit