Skip to content

chore: enhance Education workspace with Desktop Icon, Sidebar, and layout updates #412

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
tuwafula merged 2 commits into from
Mar 27, 2026
Merged

chore: enhance Education workspace with Desktop Icon, Sidebar, and layout updates #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdcc615
feat: add Desktop Icon and Workspace Sidebar; restructure Education w…
tuwafula Mar 24, 2026
480161e
chore: add Ruff config, and update Fee Schedule total aggregration
tuwafula Mar 25, 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
21 changes: 21 additions & 0 deletions education/desktop_icon/education.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"app": "education",
"bg_color": "gray",
"creation": "2026-03-24 17:21:10.011412",
"docstatus": 0,
"doctype": "Desktop Icon",
"hidden": 0,
"icon_type": "App",
"idx": 0,
"label": "Education",
"link_to": "Education",
"link_type": "Workspace Sidebar",
"logo_url": "/assets/education/edu-logo.svg",
"modified": "2026-03-24 17:21:10.011412",
"modified_by": "Administrator",
"name": "Education",
"owner": "Administrator",
"restrict_removal": 0,
"roles": [],
"standard": 1
}
11 changes: 6 additions & 5 deletions education/education/doctype/fee_schedule/fee_schedule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ def validate_fee_components(self):
if component not in fee_structure_components:
frappe.msgprint(
_("Fee Component {0} is not part of Fee Structure {1}").format(
component, frappe.bold(getlink("Fee Structure", self.fee_structure))
component,
frappe.bold(getlink("Fee Structure", self.fee_structure)),
),
alert=True,
)
Expand All @@ -115,7 +116,7 @@ def validate_total_against_fee_strucuture(self):
frappe.db.get_all(
"Fee Schedule",
filters={"fee_structure": self.fee_structure},
fields=["sum(total_amount) as total"],
fields=[{"SUM": "total_amount", "as": "total"}],
)[0]["total"]
or 0
)
Expand Down Expand Up @@ -277,9 +278,9 @@ def get_fees_mapped_doc(fee_schedule, doctype, student_id, customer):
},
},
"Fee Component": {
"doctype": "Sales Invoice Item"
if doctype == "Sales Invoice"
else "Sales Order Item",
"doctype": (
"Sales Invoice Item" if doctype == "Sales Invoice" else "Sales Order Item"
),
"field_map": {
# Fee Component Field : Child doctype Field
"item": "item_code",
Expand Down
Loading
Loading