Skip to content

Link plan view to unit info #72

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
beugo merged 2 commits into from
May 16, 2025
Merged

Link plan view to unit info #72

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
229164b
Clicking on unit in viewonly unit plan now redirects to unit info
beugo May 16, 2025
4e0e3dc
Add missing cursor-pointer to various elements
beugo May 16, 2025
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
2 changes: 2 additions & 0 deletions src/app/blueprints/plans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ def view_plan():
unit = Unit.query.get(pu.unit_id)
if unit:
sidebar_units.append({
"id": unit.id,
"name": unit.unit_name,
"code": unit.unit_code
})
Expand Down Expand Up @@ -269,6 +270,7 @@ def get_column_index(row, col):
col_index = get_column_index(pu.row, pu.col)
if 1 <= col_index <= 8:
year_cols[year][col_index].append({
"id": unit.id,
"name": unit.unit_name,
"code": unit.unit_code
})
Expand Down
2 changes: 1 addition & 1 deletion src/app/static/js/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function renderPlansTable(plans) {
plansTable.innerHTML = "";
plans.forEach(plan => {
const tr = document.createElement("tr");
tr.className = "hover:bg-gray-100 dark:hover:bg-dark-secondary";
tr.className = "hover:bg-gray-100 dark:hover:bg-dark-secondary cursor-pointer";
tr.onclick = () => {
window.location.href = `/plans/view?id=${plan.id}`;
};
Expand Down
2 changes: 1 addition & 1 deletion src/app/static/js/discover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ document.addEventListener("DOMContentLoaded", function() {
units.forEach(unit => {
const div = document.createElement("div");
div.id = "unit"
div.className = "p-4 mb-4 rounded-2xl bg-white transition bg-white dark:bg-dark-fg border-2 dark:border-dark-border shadow ext-gray-600 dark:text-dark-secondary";
div.className = "p-4 mb-4 rounded-2xl bg-white transition bg-white dark:bg-dark-fg border-2 dark:border-dark-border shadow ext-gray-600 dark:text-dark-secondary cursor-pointer";
div.onclick = () => {
window.location.href = `discover?id=${unit.id}`;
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/static/js/unitplans.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ document.addEventListener("DOMContentLoaded", function() {
${!unit.shared ? `<a onclick="post_share(${unit.id})" class="text-green-600 hover:text-green-900">Share</a>` : ""}
<a href="/plans/view?id=${unit.id}" class="text-blue-600 hover:text-blue-900 ml-2">View</a>
<a href="/create?id=${unit.id}" class="text-blue-600 hover:text-blue-900 ml-2">Edit</a>
<a onclick="post_delete(${unit.id})" class="text-red-600 hover:text-red-900 ml-2">Delete</a>
<a onclick="post_delete(${unit.id})" class="text-red-600 hover:text-red-900 ml-2 cursor-pointer">Delete</a>
</td>
`;
tbody.appendChild(tr);
Expand Down
7 changes: 5 additions & 2 deletions src/app/templates/viewonlyplan.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ <h3 class="font-semibold text-gray-700 dark:text-gray-100 text-lg mb-2 tracking-
<ul class="divide-y divide-gray-100 dark:divide-gray-800 bg-gray-50 dark:bg-dark-bg rounded-xl p-4 max-h-[50vh] overflow-y-auto shadow-inner scroll-smooth">
{% if plan_units_list %}
{% for unit in plan_units_list %}
<li class="py-2 flex items-center gap-3 group">
<li
class="py-2 flex items-center gap-3 group cursor-pointer transition"
onclick="window.open('/discover?id={{ unit.id }}', '_blank')">
<span class="font-semibold text-gray-900 dark:text-white transition group-hover:text-primary-600">
{{ unit.name }}
</span>
Expand Down Expand Up @@ -67,7 +69,8 @@ <h3 class="font-semibold text-gray-700 dark:text-gray-100 text-lg mb-2 tracking-
{% set units = year_units.get((row - 1) * 4 + col_key) %}
{% if units %}
{% for unit in units %}
<div class="rounded-xl border border-gray-200 dark:border-gray-800 bg-white/90 dark:bg-dark-bg shadow-sm px-4 py-3 group hover:ring-2 hover:ring-blue-400/40 transition-all h-24 flex flex-col justify-center">
<div class="rounded-xl border border-gray-200 dark:border-gray-800 bg-white/90 dark:bg-dark-bg shadow-sm px-4 py-3 group hover:ring-2 hover:ring-blue-400/40 transition-all h-24 flex flex-col justify-center cursor-pointer transition"
onclick="window.open('/discover?id={{ unit.id }}', '_blank')">
<div class="text-sm font-semibold text-gray-800 dark:text-white mb-0.5 group-hover:text-blue-700 dark:group-hover:text-blue-400 transition">
{{ unit.name }}
</div>
Expand Down