Skip to content

Commit

Permalink
Merge pull request #10 from ahmadiman547/patient-UI-sync
Browse files Browse the repository at this point in the history 
Update Patient & Counselor Ui
  • Loading branch information
@ahmadiman547
ahmadiman547 committed May 10, 2024
2 parents 8b36f4f + beafb89 commit da3eb5f
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 37 deletions.
8 changes: 6 additions & 2 deletions counselor/past-app.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,12 @@ <h5 class="modal-title" id="exampleModalLongTitle">Create new appointment</h5>

<!-- DataTales Example -->
<div class="card shadow mb-4">
<div class="card-header py-3">

<div class="card-header py-1">
<!-- Create appointment -->
<div class="row mx-1 justify-content-between mt-3 mb-2">
<h4 class="font-weight-bold my-2 text-dark">Chosen Date</h4>

</div>
</div>
<div class="card-body">
<div class="table-responsive">
Expand Down
11 changes: 9 additions & 2 deletions counselor/upcoming-app.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,15 @@ <h1 class="h3 mb-2 text-gray-800">Appointment (Upcoming)</h1>

<!-- DataTales Example -->
<div class="card shadow mb-4 mt-5">
<div class="card-header py-3">

<div class="card-header py-1">
<!-- Create appointment -->
<div class="row mx-1 justify-content-between mt-3 mb-2">
<h4 class="font-weight-bold my-2 text-dark">Chosen Date</h4>
<!-- Button trigger add-app page -->

<a class="btn btn-success pt-2" href="add-app.html" role="button">Add Appointment</a>

</div>
</div>
<div class="card-body">
<div class="table-responsive">
Expand Down
59 changes: 30 additions & 29 deletions patient/add-app.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<!-- Nav Item - Appointment Menu -->
<li class="nav-item active">
<a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapseTwo"
aria-expanded="true" aria-controls="collapseTwo">
aria-expanded="true" aria-controls="collapseTwo">
<i class="fas fa-calendar"></i>
<span>Appointment</span>
</a>
Expand All @@ -68,7 +68,7 @@
</div>
</div>
</li>

<hr class="sidebar-divider d-none d-md-block">

<!-- Nav Item - View Patient -->
Expand All @@ -77,7 +77,7 @@
<i class="fas fa-money-check-alt"></i>
<span>View Payment</span></a>
</li>

<!-- Divider -->
<hr class="sidebar-divider d-none d-md-block">

Expand All @@ -103,7 +103,9 @@
<i class="fa fa-bars"></i>
</button>


<h4 class="font-weight-bold text-dark">
Counseling Management System
</h4>

<!-- Topbar Navbar -->
<ul class="navbar-nav ml-auto">
Expand Down Expand Up @@ -146,39 +148,38 @@
<h1 class="h3 mb-2 text-gray-800">Add Appointment</h1>

<!-- DataTales Example -->
<div class="card shadow mb-4">
<div class="card-body">
<form>
<form>
<div class="card shadow mb-4">
<div class="card-body">

<div class="form-group col-md-6">
<label for="input-appDate">Appointment Date</label>
<input type="date" class="form-control" id="input-appDate">
<label for="input-appDate">Appointment Date</label>
<input type="date" class="form-control" id="input-appDate">
</div>
<div class="form-group col-md-6">
<label for="inputCounselor">Counselor</label>
<select id="inputCounselor" class="form-control">
<option selected>Choose one</option>
<option value="1">Adelia Marcius</option>
<option value="2">Faezah Nor</option>
</select>
<label for="inputCounselor">Counselor</label>
<select id="inputCounselor" class="form-control">
<option selected>Choose one</option>
<option value="1">Adelia Marcius</option>
<option value="2">Faezah Nor</option>
</select>
</div>
<div class="form-group col-md-4">
<label for="inputTimeSlot">Available time slot</label>
<select id="inputTimeSlot" class="form-control col-auto" required>
<option selected>None selected</option>
<option value="08:00 AM - 10:00 AM">08:00 AM - 10:00 AM</option>
<option value="10:00 AM - 12:00 PM">10:00 AM - 12:00 PM</option>
<option value="02:00 PM - 04:00 PM">02:00 PM - 04:00 PM</option>
<option value="04:00 PM - 06:00 PM">04:00 PM - 06:00 PM</option>
</select>
<label for="inputTimeSlot">Available time slot</label>
<select id="inputTimeSlot" class="form-control col-auto" required>
<option selected>None selected</option>
<option value="08:00 AM - 10:00 AM">08:00 AM - 10:00 AM</option>
<option value="10:00 AM - 12:00 PM">10:00 AM - 12:00 PM</option>
<option value="02:00 PM - 04:00 PM">02:00 PM - 04:00 PM</option>
<option value="04:00 PM - 06:00 PM">04:00 PM - 06:00 PM</option>
</select>
</div>

<input type="hidden" id="apmRoom" value="TBD">

<button type="submit" class="btn btn-primary mt-5">Add Appointment</button>
</form>
</div>
<button type="submit" class="btn btn-primary mt-5">Add Appointment</button>
</div>
</div>

</form>
</div>
<!-- /.container-fluid -->

Expand Down
5 changes: 4 additions & 1 deletion patient/edit-profile.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@
<i class="fa fa-bars"></i>
</button>


<h4 class="font-weight-bold text-dark">
Counseling Management System
</h4>

<!-- Topbar Navbar -->
<ul class="navbar-nav ml-auto">

Expand Down
4 changes: 4 additions & 0 deletions patient/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@ <h5 class="font-weight-bold my-2 mt-2">Profile</h5>
<div class="table-responsive">
<table class="table table-bordered" id="dataTable" width="100%" cellspacing="0">
<tbody>
<tr>
<td>Name</td>
<td>John Smith</td>
</tr>
<tr>
<td>IC Number</td>
<td>011010-14-1848</td>
Expand Down
3 changes: 3 additions & 0 deletions patient/login.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ <h1 class="h4 text-gray-900 mb-4">Welcome Back, Patient!</h1>
<div class="text-center">
<a class="small" href="../patient/register.html">Create an Account!</a>
</div>
<div class="text-center">
<a class="small" href="../index.html">Return to landing page</a>
</div>
</div>
</div>
</div>
Expand Down
4 changes: 3 additions & 1 deletion patient/past-app.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@
<i class="fa fa-bars"></i>
</button>


<h4 class="font-weight-bold text-dark">
Counseling Management System
</h4>

<!-- Topbar Navbar -->
<ul class="navbar-nav ml-auto">
Expand Down
4 changes: 3 additions & 1 deletion patient/upcoming-app.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@
<i class="fa fa-bars"></i>
</button>


<h4 class="font-weight-bold text-dark">
Counseling Management System
</h4>

<!-- Topbar Navbar -->
<ul class="navbar-nav ml-auto">
Expand Down
4 changes: 3 additions & 1 deletion patient/view-payment.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@
<i class="fa fa-bars"></i>
</button>


<h4 class="font-weight-bold text-dark">
Counseling Management System
</h4>

<!-- Topbar Navbar -->
<ul class="navbar-nav ml-auto">
Expand Down

0 comments on commit da3eb5f

Please sign in to comment.