Highlight weekends in the calendar..(Highlight Saturdays and Sundays in the calendar) #13505

Wanderer65 · 2025-10-23T08:58:07Z

This PR adds a visual highlight to weekends in the calendar view.
Saturdays and Sundays now have a light yellow background, making it easier for users to distinguish weekends at a glance.

Updated calendar.html to include dayRender logic for weekend highlighting
Used FullCalendar’s dayRender callback for applying styles
Works for both Engagements and Tests calendar views

No changes to backend logic; purely frontend enhancement.

dryrunsecurity · 2025-10-23T08:59:22Z

🔴 Risk threshold exceeded.

This pull request modifies a sensitive file (dojo/templates/dojo/calendar.html) and the scanner flagged multiple sensitive-codepath edits; review the changes and update .dryrunsecurity.yaml if these edits are expected or restrict authors/paths as needed.

🔴 Configured Codepaths Edit in dojo/templates/dojo/calendar.html

Vulnerability	Configured Codepaths Edit
Description	Sensitive edits detected for this file. Sensitive file paths and allowed authors can be configured in `.dryrunsecurity.yaml`.

🔴 Configured Codepaths Edit in dojo/templates/dojo/calendar.html

Vulnerability	Configured Codepaths Edit
Description	Sensitive edits detected for this file. Sensitive file paths and allowed authors can be configured in `.dryrunsecurity.yaml`.

🔴 Configured Codepaths Edit in dojo/templates/dojo/calendar.html

Vulnerability	Configured Codepaths Edit
Description	Sensitive edits detected for this file. Sensitive file paths and allowed authors can be configured in `.dryrunsecurity.yaml`.

🔴 Configured Codepaths Edit in dojo/templates/dojo/calendar.html

Vulnerability	Configured Codepaths Edit
Description	Sensitive edits detected for this file. Sensitive file paths and allowed authors can be configured in `.dryrunsecurity.yaml`.

🔴 Configured Codepaths Edit in dojo/templates/dojo/calendar.html

Vulnerability	Configured Codepaths Edit
Description	Sensitive edits detected for this file. Sensitive file paths and allowed authors can be configured in `.dryrunsecurity.yaml`.

We've notified @mtesauro.

All finding details can be found in the DryRun Security Dashboard.

valentijnscholten · 2025-10-23T13:06:20Z

dojo/templates/dojo/calendar.html

+{% block head_extra %}
+    {{ block.super }}
+    <!-- fullCalendar CSS from CDN -->
+    <link href="https://cdn.jsdelivr.net/npm/fullcalendar@3.10.5/dist/fullcalendar.min.css" rel="stylesheet" />


can you switch to locally bundled js libs please?

valentijnscholten · 2025-10-23T13:06:28Z

dojo/templates/dojo/calendar.html

+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/moment@2.29.4/moment.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/fullcalendar@3.10.5/dist/fullcalendar.min.js"></script>
+


can you switch to locally bundled js libs please?

valentijnscholten · 2025-10-23T13:06:48Z

dojo/templates/dojo/calendar.html

                    right: 'month,basicWeek,basicDay'
                },
                editable: false,
-                eventLimit: true, // allow "more" link when too many events


can you retain the comment please

valentijnscholten

thanks for the pr, left some comments

valentijnscholten · 2025-10-23T15:53:12Z

dojo/templates/dojo/calendar.html

@@ -1,50 +1,33 @@
-{% extends 'base.html' %}


why is this changed/removed?

valentijnscholten · 2025-10-23T15:53:19Z

dojo/templates/dojo/calendar.html

 {% load i18n %}

-{% block content %}
+{% block head_extra %}


why is this changed/removed?

valentijnscholten · 2025-10-23T15:53:26Z

dojo/templates/dojo/calendar.html

-    <form method="GET" id="calfilter" action="/calendar">
-        <div class="container-fluid chosen-container side-by-side">
-            <div class="row">
-                <div style="display: inline-block;">
-                    <select data-placeholder="Calendar type" id="caltype" class="chosen-select">
-                        <option value="engagements">Engagements</option>
-                        <option value="tests">Tests</option>
-                    </select>
-                </div>
-                <div style="display: inline-block;">
-                    <select data-placeholder="All users" multiple id="lead" name="lead" class="chosen-select">
-                        <option value="0">All users</option>
-                        <option value="-1">Unassigned</option>
-                        {% for u in users %}
-                            <option value="{{ u.id }}">{{ u.username }}</option>
-                        {% endfor %}
-                    </select>
-                </div>
-                <div style="display: inline-block;">
-                    <input class="btn btn-primary" type="submit" value="Apply" />
-                </div>
-            </div>
-        </div>
-    </form>
-    <br/><br/>
-    <div id="calendar"></div>
-    <br/><br/>


why is this changed/removed?

valentijnscholten

Some comments and can you base the PR against the bugfix branch as per the PR instructions?

…JS/CSS

accesslint

There are accessibility issues in these changes.

accesslint · 2025-10-23T16:28:04Z

dojo/templates/dojo/calendar.html

+    <div class="container-fluid chosen-container side-by-side">
+        <div class="row">
+            <div style="display: inline-block;">
+                <select data-placeholder="Calendar type" id="caltype" class="chosen-select">


Looks like this element is missing an accessible name or label. That makes it hard for people using screen readers or voice control to use the control.

accesslint · 2025-10-23T16:28:04Z

dojo/templates/dojo/calendar.html

+                </select>
+            </div>
+            <div style="display: inline-block;">
+                <select data-placeholder="All users" multiple id="lead" name="lead" class="chosen-select">


Looks like this element is missing an accessible name or label. That makes it hard for people using screen readers or voice control to use the control.

… as per reviewer

…JS/CSS, add accessible labels

Wanderer65 · 2025-10-23T17:37:36Z

Hi @valentijnscholten , I checked the remote repository and there is no bugfix branch, only master. Should I base the PR on master instead, or is there another branch I should use?

valentijnscholten · 2025-10-23T17:44:52Z

This branch: https://github.com/DefectDojo/django-DefectDojo/tree/bugfix. In your local clone you should be able to do something like:

git checkout bugfix

Wanderer65 · 2025-10-23T17:55:27Z

I checked the remote repository, but there doesn’t appear to be a bugfix branch ..

valentijnscholten · 2025-10-23T17:58:59Z

How did you create your fork? Looks like it only has the master branch. For now it looks OK as bugfix and master are not too different. I've changed the base branch here on the PR.

valentijnscholten · 2025-10-23T18:00:18Z

But it looks like your vendoring the libraries? The goal is that any new packages must be installed via yarn.

Wanderer65 · 2025-10-23T18:15:03Z

Hi @valentijnscholten , thanks for the feedback! I understand that instead of vendoring the libraries, I should install them via yarn. Should I update the PR to use yarn-managed FullCalendar, or is it okay to keep it vendored for this change?

valentijnscholten · 2025-10-23T19:43:19Z

You need to make the PR in line with the existing codebase which has all dependencies in npm/yarn.

valentijnscholten · 2025-10-27T18:22:05Z

Hello @Wanderer65, Do you need more gelp/guidance?

Wanderer65 · 2025-10-27T18:26:01Z

Well,I am trying check if that is good?? Mayeb aftet that I might need help 😅

Wanderer65 · 2025-11-03T22:37:44Z

@valentijnscholten yeah please Guidance?

valentijnscholten · 2025-11-10T18:40:29Z

@Wanderer65 At first glance it looked you wanted to add a new npm/yarn package fullcalendar. But that's already in place in the project. Can you not include it in the pages needed similar to what is done in base.html:

<script src="{% static "fullcalendar/dist/fullcalendar.min.js" %}"></script>

If it's in base.html already, it should be available almost anywhere in Defect Dojo already. I see that calendar.html extends base.html, so the js and css should already be loaded without doing any link or script tags.
Maybe they are needed to load moment. And jquery, but that should also already be loaded.
But moment and jquery are not present in the fullcalendar package that is included with Defect Dojo.
Maybe they are only available in newer versions of fullcalendar? Looks like the latest is v6 and Defect Dojo is v3.

You could attempt to upgrade it and make it work, but I'm not sure if the calendar is that high on the list of priorities for the Defect Dojo team.

You could run yarn inside the components directory to add new packages, etc. You should commit the resulting package-lock.json and yarn.lock files.

Highlight weekends in the calendar

eb3bea7

Wanderer65 requested review from Maffooch and mtesauro as code owners October 23, 2025 08:58

github-actions bot added the ui label Oct 23, 2025

valentijnscholten reviewed Oct 23, 2025

View reviewed changes

valentijnscholten requested changes Oct 23, 2025

View reviewed changes

Fix: use local FullCalendar libs and restore comment per review feedback

1bb09ce

Wanderer65 requested a review from valentijnscholten October 23, 2025 15:51

valentijnscholten reviewed Oct 23, 2025

View reviewed changes

dojo/templates/dojo/calendar.html

@@ -1,50 +1,33 @@

{% extends 'base.html' %}

Copy link

Member

valentijnscholten Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this changed/removed?

valentijnscholten reviewed Oct 23, 2025

View reviewed changes

dojo/templates/dojo/calendar.html

{% load i18n %}

{% block content %}

{% block head_extra %}

Copy link

Member

valentijnscholten Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this changed/removed?

valentijnscholten reviewed Oct 23, 2025

View reviewed changes

valentijnscholten requested changes Oct 23, 2025

View reviewed changes

Fix calendar.html: restore form, retain weekend highlight, use local …

2b7c892

…JS/CSS

accesslint bot reviewed Oct 23, 2025

View reviewed changes

Wanderer65 added 2 commits October 23, 2025 22:33

Restore form, retain weekend highlight, use local FullCalendar JS/CSS…

7398036

… as per reviewer

Fix calendar.html: restore form, retain weekend highlight, use local …

433366f

…JS/CSS, add accessible labels

valentijnscholten changed the base branch from master to bugfix October 23, 2025 17:57

Merge branch 'bugfix' into calendar-weekend-highlight

d46b6a5

valentijnscholten added this to the 2.51.3 milestone Oct 23, 2025

Maffooch marked this pull request as draft October 27, 2025 00:58

valentijnscholten modified the milestones: 2.51.3, 2.52.0 Oct 27, 2025

valentijnscholten modified the milestones: 2.52.0, 2.52.1 Nov 3, 2025

valentijnscholten removed this from the 2.52.1 milestone Nov 10, 2025

Highlight weekends in the calendar..(Highlight Saturdays and Sundays in the calendar) #13505

Are you sure you want to change the base?

Highlight weekends in the calendar..(Highlight Saturdays and Sundays in the calendar) #13505

Conversation

Wanderer65 commented Oct 23, 2025

Uh oh!

dryrunsecurity bot commented Oct 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🔴 Risk threshold exceeded.

Uh oh!

valentijnscholten Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

valentijnscholten Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

valentijnscholten Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

valentijnscholten left a comment

Choose a reason for hiding this comment

Uh oh!

valentijnscholten Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

valentijnscholten Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

valentijnscholten Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

valentijnscholten left a comment

Choose a reason for hiding this comment

Uh oh!

accesslint bot left a comment

Choose a reason for hiding this comment

Uh oh!

accesslint bot Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

accesslint bot Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

Wanderer65 commented Oct 23, 2025

Uh oh!

valentijnscholten commented Oct 23, 2025

Uh oh!

Wanderer65 commented Oct 23, 2025

Uh oh!

valentijnscholten commented Oct 23, 2025

Uh oh!

valentijnscholten commented Oct 23, 2025

Uh oh!

Wanderer65 commented Oct 23, 2025

Uh oh!

valentijnscholten commented Oct 23, 2025

Uh oh!

valentijnscholten commented Oct 27, 2025

Uh oh!

Wanderer65 commented Oct 27, 2025

Uh oh!

Wanderer65 commented Nov 3, 2025

Uh oh!

valentijnscholten commented Nov 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

dryrunsecurity bot commented Oct 23, 2025 •

edited

Loading

valentijnscholten commented Nov 10, 2025 •

edited

Loading