diff --git a/billingAndInvoices.php b/billingAndInvoices.php new file mode 100644 index 00000000..e44cd393 --- /dev/null +++ b/billingAndInvoices.php @@ -0,0 +1,60 @@ + + + + + + + Document + + + + + + +

Billing and Invoices

+ +
+... +

No bills issued currently!

+
+ + \ No newline at end of file diff --git a/chat/uploads/profile_pic.svg b/chat/uploads/profile_pic.svg index 202e103a..69da8d89 100644 --- a/chat/uploads/profile_pic.svg +++ b/chat/uploads/profile_pic.svg @@ -1,3 +1,4 @@ +<<<<<<< Updated upstream @@ -7,3 +8,14 @@ +======= + + + + + + + + + +>>>>>>> Stashed changes diff --git a/chat_home.php b/chat_home.php index 91d55fad..c65578e1 100644 --- a/chat_home.php +++ b/chat_home.php @@ -6,6 +6,15 @@ // die(); if (isset($_SESSION['dietitianuserID'])) { # database connection file +<<<<<<< Updated upstream +======= + $user=$_SESSION['dietitianuserID']; + $sql="SELECT * FROM messages where dietitianID='$user'"; + $result=$conn->query($sql); + if(mysqli_num_rows($result)<1){ + header('Location:message.php'); + } +>>>>>>> Stashed changes include 'app/db.conn.php'; include 'app/helpers/user.php'; diff --git a/client_list.php b/client_list.php index 126a3ac5..a1f6ecab 100644 --- a/client_list.php +++ b/client_list.php @@ -1,5 +1,16 @@ query($sql); + if(mysqli_num_rows($result)<1){ + header('Location:clientlist.php'); + } +} +>>>>>>> Stashed changes ?> diff --git a/clientlist.php b/clientlist.php new file mode 100644 index 00000000..be38b7ec --- /dev/null +++ b/clientlist.php @@ -0,0 +1,107 @@ + + + + + + + Document + + + + + +
+
+

Client List

+
+
+
+ + +
+
+

+
+ +
+
+ +
No clients added yet!
+
+ +
+
+
+ +
+
+ + \ No newline at end of file diff --git a/dietplan.php b/dietplan.php new file mode 100644 index 00000000..bfac1c95 --- /dev/null +++ b/dietplan.php @@ -0,0 +1,80 @@ + + + + + + + Document + + + + + + +

Diet Plan

+ +
+... +

You haven't created any plan yet!

+
+ + + \ No newline at end of file diff --git a/images/Medal (1).png b/images/Medal (1).png new file mode 100644 index 00000000..c7e4c316 Binary files /dev/null and b/images/Medal (1).png differ diff --git a/images/Vector (9).png b/images/Vector (9).png new file mode 100644 index 00000000..5fe1fe86 Binary files /dev/null and b/images/Vector (9).png differ diff --git a/images/bill.png b/images/bill.png new file mode 100644 index 00000000..b0de72f0 Binary files /dev/null and b/images/bill.png differ diff --git a/images/camera.svg b/images/camera.svg index b7b5f429..62af57df 100644 --- a/images/camera.svg +++ b/images/camera.svg @@ -1,3 +1,17 @@ - - + + + + + + + + + + + + + + + + diff --git a/images/client.png b/images/client.png index 901b4416..672a5e94 100644 Binary files a/images/client.png and b/images/client.png differ diff --git a/images/dietplan.png b/images/dietplan.png new file mode 100644 index 00000000..773a6a35 Binary files /dev/null and b/images/dietplan.png differ diff --git a/images/form.png b/images/form.png new file mode 100644 index 00000000..f39eb6d0 Binary files /dev/null and b/images/form.png differ diff --git a/images/lilac user icon (2).png b/images/lilac user icon (2).png new file mode 100644 index 00000000..6cd4a99b Binary files /dev/null and b/images/lilac user icon (2).png differ diff --git a/images/lilac user icon (4).png b/images/lilac user icon (4).png new file mode 100644 index 00000000..2fdd2eff Binary files /dev/null and b/images/lilac user icon (4).png differ diff --git a/images/man_drinking_water.svg b/images/man_drinking_water.svg index 22398ae1..1843bb80 100644 --- a/images/man_drinking_water.svg +++ b/images/man_drinking_water.svg @@ -1,9 +1,9 @@ - - + + - + - + diff --git a/images/pay.png b/images/pay.png new file mode 100644 index 00000000..f8f997a2 Binary files /dev/null and b/images/pay.png differ diff --git a/index.php b/index.php index 9fbf7606..2a3fb4d9 100644 --- a/index.php +++ b/index.php @@ -4,7 +4,18 @@ // Get Id if(isset($_SESSION['name'])){ $dietitian_id = $_SESSION['name']; - +<<<<<<< Updated upstream + +======= + $user=$_SESSION['name']; + $sql="SELECT * FROM addclient WHERE dietitianuserID='$user'"; + $q="SELECT * FROM create_event WHERE dietitianuserID='$user'"; + $result = $conn->query($sql); + $req= $conn->query($q); + if(mysqli_num_rows($result)<1 && mysqli_num_rows($req)<1){ + header('Location:upcomingevents.php'); + } +>>>>>>> Stashed changes # database connection file include 'app/db.conn.php'; @@ -348,7 +359,10 @@ function fetchInformation($client_id){ justify-content: flex-end; width: 95%; padding-right: 1.5rem; +<<<<<<< Updated upstream +======= +>>>>>>> Stashed changes } .symbols-container, .values-container{ @@ -625,8 +639,13 @@ function fetchInformation($client_id){
+<<<<<<< Updated upstream +======= + + +>>>>>>> Stashed changes