Add a select_across checkbox on the ProjectReportForm #1524

Signed-off-by: tdruez <[email protected]>
aboutcode-org · Jan 13, 2025 · a5d756d · a5d756d
1 parent ce4e46a
commit a5d756d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/scanpipe/forms.py b/scanpipe/forms.py
@@ -287,6 +287,12 @@ class ProjectReportForm(forms.Form):
         initial="discoveredpackage",
         widget=forms.RadioSelect,
     )
+    select_across = forms.BooleanField(
+        label="",
+        required=False,
+        initial=0,
+        help_text="All project matching current search and filters will be included.",
+    )
 
 
 class ListTextarea(forms.CharField):

diff --git a/scanpipe/templates/registration/login.html b/scanpipe/templates/registration/login.html
@@ -21,7 +21,6 @@
           <div class="field">
             <label class="label">Username</label>
             <div class="control has-icons-left">
-              <!-- {{ form.username }}-->
               <input class="input" type="text" name="username" autofocus autocomplete="username" maxlength="150" required id="id_username">
               <span class="icon is-small is-left">
                 <i class="fa-solid fa-user"></i>
@@ -32,7 +31,6 @@
           <div class="field mb-5">
             <label class="label">Password</label>
             <div class="control has-icons-left">
-              <!-- {{ form.password }}-->
               <input class="input" type="password" name="password" autocomplete="current-password" required id="id_password">
               <span class="icon is-small is-left">
               <i class="fa-solid fa-lock"></i>

diff --git a/scanpipe/templates/scanpipe/modals/projects_report_modal.html b/scanpipe/templates/scanpipe/modals/projects_report_modal.html
@@ -1,3 +1,4 @@
+{% load humanize %}
 <div class="modal" id="modal-projects-report">
   <div class="modal-background"></div>
   <div class="modal-card">
@@ -7,9 +8,19 @@
     </header>
     <form action="{% url 'project_action' %}" method="post" id="report-projects-form">{% csrf_token %}
       <section class="modal-card-body">
-        <ul class="mb-3">
-          {{ report_form.as_ul }}
-        </ul>
+        <div class="field">
+          <label class="label">{{ report_form.model_name.label }}</label>
+          <div class="control">
+            {{ report_form.model_name }}
+          </div>
+        </div>
+        <div class="field">
+          <label class="checkbox" for="{{ report_form.select_across.id_for_label }}">
+            <input type="checkbox" name="{{ report_form.select_across.name }}" id="{{ report_form.select_across.id_for_label }}">
+            Include all {{ paginator.count|intcomma }} projects
+          </label>
+          <p class="help">{{ report_form.select_across.help_text }}</p>
+        </div>
       </section>
       <input type="hidden" name="action" value="report">
       <footer class="modal-card-foot is-flex is-justify-content-space-between">

diff --git a/scanpipe/views.py b/scanpipe/views.py
@@ -1232,13 +1232,15 @@ def export_xlsx_file_response(self):
 
         return super().export_xlsx_file_response()
 
-    def get_projects_queryset(self):
+    def get_projects_queryset(self, select_across=False):
+        # TODO: select_across
         return Project.objects.filter(pk__in=self.selected_project_ids)
 
     def get_export_xlsx_queryset(self):
         model_name = self.report_form.cleaned_data["model_name"]
+        select_across = self.report_form.cleaned_data["select_across"]
         queryset = output.get_queryset(project=None, model_name=model_name)
-        projects = self.get_projects_queryset()
+        projects = self.get_projects_queryset(select_across=select_across)
         return queryset.filter(project__in=projects)
 
     def get_export_xlsx_prepend_fields(self):