Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions public/css/fund.css
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,8 @@ body {
color: white;
text-decoration: none;
font-size: 1.4rem;
margin: 2vh 0;
border-bottom: 1px dashed #ddd;
padding-bottom: 5px;
padding: 5px 0;
cursor: pointer;
}

Expand Down Expand Up @@ -258,7 +257,6 @@ input::-webkit-inner-spin-button {
padding: 3.5vw;
}
.fee-entry {
margin: 2vh 0;
font-size: 1rem;
}
.form {
Expand Down
2 changes: 1 addition & 1 deletion views/listings/archive.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<form action="/students/<%= students._id %>/restore" method="POST">
<button class="edit-info">Restore</button>
</form>
<form action="/students/<%=students.id%>/delete?_method=delete" method="post">
<form action="/students/<%= students._id %>/delete?_method=delete" method="post">
<button class="edit-info">
Delete
</button>
Expand Down
96 changes: 59 additions & 37 deletions views/listings/show.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -13,43 +13,63 @@
<h1><%= student.name %></h1>
</div>
<p><strong>Grade :</strong> <%= student.grade %></p>
<p class="parent"><strong>Parent :</strong> <%= student.parent %></p>
<p class="call">
<strong>Contact :</strong> <%= student.contact %>
<a href="https://wa.me/91<%=student.contact%>" target="_blank">
<i class="fa-brands fa-whatsapp"></i
></a>
<a href="tel:+91<%= student.contact %>">
<i class="fa-solid fa-phone"></i
></a>
</p>
<p class="call">
<strong>Phone :</strong> <%= student.phone %>
<a href="https://wa.me/91<%=student.phone%>" target="_blank"
><i class="fa-brands fa-whatsapp"></i></a
>&nbsp;
<a href="tel:+91<%= student.phone %>">
<i class="fa-solid fa-phone"></i>
</a>
</p>
<p><strong>Note :</strong> <%= student.note %></p>
<p><strong>Joining Date :</strong> <%= formattedDate %></p>
<p><strong>Fees :</strong> <%= student.fees %></p>
<p><strong>Due Fees :</strong> <%= student.dueFees %></p>
<p class="remind">
<strong>Remind on :</strong>
<a
href="<%=`https://wa.me/91${student.contact}?text=${student.name},Your monthly fees ${student.dueFees} is DUE.Kindly clear it at the earliest.`%>"
><i class="fa-brands fa-whatsapp"></i></a
>&nbsp;
<a
href="<%=`sms:+91${student.phone}?body=${student.name} +, Your monthly fees ₹${student.dueFees} is DUE. Kindly clear it at the earliest.`%>"
><i class="fa-solid fa-message"></i></a
>&nbsp;
<a href="tel:+91<%= student.phone %>">
<i class="fa-solid fa-phone"></i>
</a>
</p>
<p><strong>Joining Date :</strong> <%= formattedDate %></p>
<%if(student.parent){%>
<p class="parent"><strong>Parent :</strong> <%= student.parent %></p>
<%}%>
<%if(student.contact){%>
<p class="call">
<strong>Contact :</strong> <%= student.contact %>
<a href="https://wa.me/91<%=student.contact%>" target="_blank">
<i class="fa-brands fa-whatsapp"></i></a>
<a href="tel:+91<%= student.contact %>">
<i class="fa-solid fa-phone"></i></a>
</p>
<%}%>
<%if(student.phone){%>
<p class="call">
<strong>Phone :</strong> <%= student.phone %>
<a href="https://wa.me/91<%=student.phone%>" target="_blank"
><i class="fa-brands fa-whatsapp"></i></a
>&nbsp;
<a href="tel:+91<%= student.phone %>">
<i class="fa-solid fa-phone"></i>
</a>
</p>
<%}%>
<%if(student.dueFees > student.fees && (student.phone || student.contact)){%>
<%if(student.contact){%>
<p class="remind">
<strong>Remind on :</strong> Contact
<a
href="<%=`https://wa.me/91${student.contact}?text=${student.name},Your monthly fees ${student.dueFees} is DUE.Kindly clear it at the earliest.`%>"
><i class="fa-brands fa-whatsapp"></i></a
>&nbsp;
<a
href="<%=`sms:+91${student.contact}?body=${student.name} +, Your monthly fees ₹${student.dueFees} is DUE. Kindly clear it at the earliest.`%>"
><i class="fa-solid fa-message"></i></a
>
</p>
<%}%>
<%if(student.phone){%>
<p class="remind">
<strong>Remind on :</strong> Phone
<a
href="<%=`https://wa.me/91${student.phone}?text=${student.name},Your monthly fees ${student.dueFees} is DUE.Kindly clear it at the earliest.`%>"
><i class="fa-brands fa-whatsapp"></i></a
>&nbsp;
<a
href="<%=`sms:+91${student.phone}?body=${student.name} +, Your monthly fees ₹${student.dueFees} is DUE. Kindly clear it at the earliest.`%>"
><i class="fa-solid fa-message"></i></a
>
</p>
<%}%>
<%}%>
<%if(student.note){%>
<p><strong>Note :</strong> <%= student.note %></p>
<%}%>
</div>
<div class="addFess">
<form
Expand Down Expand Up @@ -111,7 +131,9 @@
Paid On : <%= fees.paidDate.toLocaleDateString("en-GB", { weekday:
"short", day: "2-digit", month: "short", year: "numeric" }) %>
</p>
<p>Note : <%=fees.note%></p>
<%if(fees.note){%>
<p>Note : <%=fees.note%></p>
<%}%>
</div>
<hr />
<% }); %> <% } else { %>
Expand All @@ -122,7 +144,7 @@
<div class="flex">
<a href="/students/<%= student.id%>/edit">
<button class="edit-info">
<i class="fa-regular fa-pen-to-square"></i> Edit Details
<i class="fa-regular fa-pen-to-square"></i> Add / Edit
</button>
</a>
<a href="/students/<%= student.id%>/deactivate" method="post">
Expand Down