-
Notifications
You must be signed in to change notification settings - Fork 15
Add improved maintenance column with a dropdown showing tasks #1761
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.
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
Open
Simrayz
wants to merge
4
commits into
main
Choose a base branch
from
feat/1745-improve-planned-maintenance-column
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
4dec947
Add improved maintenace column with a dropdown showing tasks
Simrayz 1972920
Improve dropdown items by adding status badges
Simrayz 0205d27
Use date format from preferences and remove unneeded code
Simrayz 1851bcf
fixup! Add improved maintenace column with a dropdown showing tasks
Simrayz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Improve maintenance column by adding a dropdown with tasks that affect the incident |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 34 additions & 3 deletions
37
src/argus/htmx/templates/htmx/incident/cells/_incident_maintenance.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,35 @@ | ||
| <!-- htmx/templates/htmx/incident/cells/_incident_maintenance.html --> | ||
| {% if incident.planned_maintenance_tasks.exists %} | ||
| <i class="text-primary text-lg fa-solid fa-person-digging"></i> | ||
| {% endif %} | ||
| {% with tasks=incident.planned_maintenance_tasks.all %} | ||
| {% if tasks %} | ||
| <div class="dropdown dropdown-hover dropdown-bottom dropdown-end"> | ||
| <button tabindex="0" | ||
| class="btn btn-ghost btn-sm cursor-pointer flex items-center gap-1 text-primary"> | ||
| <i class="fa-solid fa-person-digging"></i> | ||
| <span class="text-xs">{{ tasks|length }} task{{ tasks|length|pluralize }}</span> | ||
| </button> | ||
| <div tabindex="0" | ||
| class="dropdown-content bg-base-100 rounded-box z-20 w-72 p-2 shadow-lg flex flex-col gap-1"> | ||
| {% for task in tasks %} | ||
| <a href="{% url 'htmx:plannedmaintenance-detail' pk=task.pk %}" | ||
| class="flex flex-col gap-0.5 p-2 rounded-lg hover:bg-base-200 transition-colors"> | ||
| <span class="font-medium truncate" title="{{ task.description }}">{{ task.description|default:"No description" }}</span> | ||
| <div class="flex items-center justify-between gap-2 text-xs opacity-60"> | ||
| <span>{{ task.start_time|date:preferences.argus_htmx.date_format }} | ||
| {% if task.end_time.year >= 9999 %} | ||
| - now | ||
| {% else %} | ||
| - {{ task.end_time|date:preferences.argus_htmx.date_format }} | ||
| {% endif %} | ||
| </span> | ||
| {% if task.current %} | ||
| <span class="badge badge-success badge-sm">Ongoing</span> | ||
| {% else %} | ||
| <span class="badge badge-ghost badge-sm">Completed</span> | ||
| {% endif %} | ||
| </div> | ||
| </a> | ||
| {% endfor %} | ||
| </div> | ||
| </div> | ||
| {% endif %} | ||
| {% endwith %} | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.