Skip to content

Feture #5

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

Merged
vikrant-vikrant merged 3 commits into from
Jan 2, 2026
Merged

Feture #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b907a5c
Merge pull request #4 from vikrant-vikrant/main
vikrant-vikrant Jan 1, 2026
35cdc28
feat: update fund management styles and improve report display
vikrant-vikrant Jan 2, 2026
7983f70
Merge branch 'main' into feture
vikrant-vikrant Jan 2, 2026
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
66 changes: 22 additions & 44 deletions public/css/fund.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,70 +31,60 @@ body {
flex-wrap: wrap;
}
.monthly-reports-container {
margin: 4vh auto;
margin: 2vw auto;
display: flex;
flex-wrap: wrap;
background-color: grey;
justify-content: space-around;
}
.report-card {
width: 27vw;
background: #31312f;
border-radius: 30px;
padding: 2rem;
/* margin-bottom: 25px; */
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.08);
/* margin: 0 3vw 0 0; */
}

/* .report-header {
display: flex;
justify-content: space-between;
align-items: center;
} */

/* .report-header h2 {
margin: 0;
color: #222;
} */
.monthly-reports-container .report-card {
margin-bottom: 2vw;
}

.report-stats {
margin-bottom: 10px;
width: 100%;
}

.stat {
padding: 0.6rem;
border-radius: 8px;
text-align: center;
color: #282828;
color: white;
border-bottom: 1px dashed #ddd;
display: flex;
justify-content: space-around;
}
.stat .total {
border-radius: 30px;
justify-content: space-between;
padding: 0.6rem;
padding: 0.6rem 1.2rem;
}
.total span {
font-size: 2.5rem;
font-weight: 600;
}
.new {
display: flex;
justify-content: space-between;
}

.stat p {
.stat div {
margin: 0;
font-size: 14px;
}

.stat h3 {
margin-top: 8px;
font-size: 18px;
}

.stat.left {
background: #f39c12;
}

.expense-section {
margin-top: 20px;
}

.expense-section h4 {
margin-bottom: 10px;
/* color: #333; */
color: white;
}

Expand All @@ -108,18 +98,14 @@ body {
justify-content: space-between;
padding: 8px 0;
border-bottom: 1px dashed #ddd;
/* color: #444; */
color: white;
/* font-size: 1.5rem; */
}
.addFess {
width: 27vw;
}
.feeHistory {
background-color: #31312f;
/* background-color: #fcfcfc; */
color: rgba(255, 255, 255, 0.7);
/* color: black; */
width: 27vw;
padding: 2rem;
border-radius: 30px;
Expand All @@ -146,9 +132,6 @@ body {
font-size: 2.5rem;
font-weight: 600;
letter-spacing: -1px;
/* position: relative;
display: flex;
align-items: center; */
color: #31312f;
color: #00bfff;
}
Expand All @@ -162,10 +145,7 @@ body {
border-radius: 30px;
position: relative;
background-color: #31312f;
/* background-color: white; */
color: rgba(255, 255, 255, 0.7);
/* margin-left: auto; */
/* margin-right: auto; */
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.08);
}
.form label {
Expand All @@ -175,9 +155,7 @@ body {

.form label .input {
background-color: #333;
/* background-color: white; */
color: rgba(255, 255, 255, 0.7);
/* color: black; */
width: 100%;
padding: 20px 05px 05px 10px;
outline: 0;
Expand Down Expand Up @@ -209,7 +187,6 @@ input::-webkit-inner-spin-button {
.form label .input:focus + span,
.form label .input:valid + span {
color: #00bfff;
/* color: #31312f; */
top: -5px;
font-size: 1.2em;
font-weight: 600;
Expand All @@ -230,12 +207,10 @@ input::-webkit-inner-spin-button {
font-weight: bold;
transform: 0.3s ease;
background-color: #00bfff;
/* background-color: #31312f; */
}

.submit:hover {
background-color: #00bfff96;
/* background-color: #31312f96; */
}

.student {
Expand Down Expand Up @@ -297,4 +272,7 @@ input::-webkit-inner-spin-button {
.flex {
margin: 3vw;
}
.monthly-reports-container{
margin: 2vh 5vw;
}
}
77 changes: 63 additions & 14 deletions views/listings/fund.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,17 @@
<h2 class="title"><%= thisMonthYear %></h2>
</div>
<div class="report-stats">
<div class="stat earning">
<p>
Total Revenue :
<div class="stat">
<div class="total">
<span
><%=thisMonthData.totalEarning.toLocaleString('en-IN')%>
&#8377;</span
>
</p>
<p>
Total Due :
<span><%=totalDue.toLocaleString('en-IN')%> &#8377;</span>
</p>
><br />Total Revenue
</div>
<div class="total">
<span><%=totalDue.toLocaleString('en-IN')%> &#8377;</span
><br />Total Due
</div>
</div>
<div class="stat new">
<span>New Students : <%=thisMonthData.newStudents%></span>
Expand Down Expand Up @@ -101,18 +100,68 @@
feesThisMonth.forEach(fee => { %>
<div class="fee-entry">
<p>
<strong>₹ <%= fee.feesHistory.amount %></strong>
by <%= fee.name %> / <%= fee.grade %> <br />
Paid on: <%= new Date(fee.feesHistory.paidDate)
.toLocaleDateString('en-GB', { weekday: 'short', day: 'numeric',
month: 'short' }) .replace(/,/g, '') %>
<strong><%= fee.feesHistory.amount %>₹</strong>
— <%= fee.name %> / <%= fee.grade %> | Paid on: <%= new
Date(fee.feesHistory.paidDate) .toLocaleDateString('en-GB', {
weekday: 'short', day: 'numeric', month: 'short' }) .replace(/,/g,
'') %>
</p>
</div>
<% }) %> <% } else { %>
<p>No fees recorded this month.</p>
<% } %>
</div>
</div>
<div class="nav-tabs">
<h1>Previous Reports</h1>
</div>
<div class="monthly-reports-container">
<%for(let data of previousReport){%>
<div class="report-card">
<div class="report-header">
<h2 class="title">
<%= new Date(data.year, data.month - 1).toLocaleString('en-US', {
month: 'short', year: 'numeric' }) %>
</h2>
</div>

<div class="report-stats">
<div class="stat">
<div class="total">
<span
><%=data.totalEarning.toLocaleString('en-IN')%> &#8377;</span><br>Total Revenue
</div>
</div>
<div class="stat new">
<span>New Students : <%= data.newStudents %></span>
<span>Students Left : <%= data.studentsLeft %></span>
</div>
</div>

<div class="expense-section">
<h4>Expense Details</h4>
<ul>
<%for(let exp of data.expenses){%>
<li>
<span><%= exp.note%></span><br />
<span><%= exp.amount%></span><br />
<span
><%= new Date(exp.paidDate) .toLocaleDateString('en-GB', {
weekday: 'short', day: 'numeric', month: 'short' })
.replace(/,/g, '') %></span
>
</li>
<%}%>
</ul>
<div class="report-stats">
<div class="stat expense">
<p>Total Expense : <span> XX,XXX&#8377;</span></p>
</div>
</div>
</div>
</div>
<%}%>
</div>
</div>
</div>
</body>