From 37f50624faf16dedd8d59ba7ea4f219dabb664db Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Fri, 25 Feb 2022 11:49:05 +0100
Subject: [PATCH 1/3] change redirect to unansigned lot next to do login
 instead of go to profile page

---
 .../templates/ereuse_devicehub/base_site.html | 37 ++++++++++++++-----
 ereuse_devicehub/views.py                     |  4 +-
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html
index 5bd1994c..f9c1e075 100644
--- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html
+++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html
@@ -5,7 +5,7 @@
 <header id="header" class="header fixed-top d-flex align-items-center">
 
   <div class="d-flex align-items-center justify-content-between">
-    <a href="index.html" class="logo d-flex align-items-center">
+    <a href="{{ url_for('inventory.devices.devicelist')}}" class="logo d-flex align-items-center">
       <img src="{{ url_for('static', filename='img/usody-logo-black.svg') }}" alt="">
     </a>
     <i class="bi bi-list toggle-sidebar-btn"></i>
@@ -81,7 +81,7 @@
 <aside id="sidebar" class="sidebar">
 
   <ul class="sidebar-nav" id="sidebar-nav">
-
+    <!-- We need defined before the Dashboard
     <li class="nav-item">
       <a class="nav-link collapsed" href="index.html">
         <i class="bi bi-grid"></i>
@@ -99,10 +99,18 @@
     <li class="nav-heading">Lots</li>
 
     <li class="nav-item">
+      {% if lot and lot.is_incoming %}
+      <a class="nav-link" data-bs-target="#incoming-lots-nav" data-bs-toggle="collapse" href="#">
+      {% else %}
       <a class="nav-link collapsed" data-bs-target="#incoming-lots-nav" data-bs-toggle="collapse" href="#">
+      {% endif %}
         <i class="bi bi-arrow-down-right"></i><span>Incoming Lots</span><i class="bi bi-chevron-down ms-auto"></i>
       </a>
+      {% if lot and lot.is_incoming %}
+      <ul id="incoming-lots-nav" class="nav-content collapse show" data-bs-parent="#sidebar-nav">
+      {% else %}
       <ul id="incoming-lots-nav" class="nav-content collapse" data-bs-parent="#sidebar-nav">
+      {% endif %}
         {% for lot in lots %}
         {% if lot.is_incoming %}
         <li>
@@ -116,10 +124,18 @@
     </li><!-- End Incoming Lots Nav -->
 
     <li class="nav-item">
+      {% if lot and lot.is_outgoing %}
+      <a class="nav-link" data-bs-target="#outgoing-lots-nav" data-bs-toggle="collapse" href="#">
+      {% else %}
       <a class="nav-link collapsed" data-bs-target="#outgoing-lots-nav" data-bs-toggle="collapse" href="#">
+      {% endif %}
         <i class="bi bi-arrow-up-right"></i><span>Outgoing Lots</span><i class="bi bi-chevron-down ms-auto"></i>
       </a>
+      {% if lot and lot.is_outgoing %}
+      <ul id="outgoing-lots-nav" class="nav-content collapse show" data-bs-parent="#sidebar-nav">
+      {% else %}
       <ul id="outgoing-lots-nav" class="nav-content collapse " data-bs-parent="#sidebar-nav">
+      {% endif %}
         {% for lot in lots %}
         {% if lot.is_outgoing %}
         <li>
@@ -133,10 +149,18 @@
     </li><!-- End Outgoing Lots Nav -->
 
     <li class="nav-item">
-      <a class="nav-link collapsed" data-bs-target="#temporal-lots-nav" data-bs-toggle="collapse" href="#">
+      {% if lot and lot.is_temporary %}
+      <a class="nav-link" data-bs-target="#temporal-lots-nav" data-bs-toggle="collapse" href="#">
+      {% else %}
+      <a class="nav-link collapsed"  data-bs-target="#temporal-lots-nav" data-bs-toggle="collapse" href="#">
+      {% endif %}
         <i class="bi bi-layout-text-window-reverse"></i><span>Temporary Lots</span><i class="bi bi-chevron-down ms-auto"></i>
       </a>
+      {% if lot and lot.is_temporary %}
+      <ul id="temporal-lots-nav" class="nav-content collapse show" data-bs-parent="#sidebar-nav">
+      {% else %}
       <ul id="temporal-lots-nav" class="nav-content collapse " data-bs-parent="#sidebar-nav">
+      {% endif %}
         <li>
           <a href="{{ url_for('inventory.devices.lot_add')}}">
             <i class="bi bi-plus" style="font-size: larger;"></i><span>New temporary lot</span>
@@ -163,13 +187,6 @@
       </a>
     </li><!-- End Tags Page Nav -->
 
-    <li class="nav-item">
-      <a class="nav-link collapsed" href="{{ url_for('Document.StampsView') }}">
-        <i class="bi bi-pin-map-fill"></i>
-        <span>Stamp</span>
-      </a>
-    </li><!-- End Stamp Page Nav -->
-
   </ul>
 
 </aside><!-- End Sidebar-->
diff --git a/ereuse_devicehub/views.py b/ereuse_devicehub/views.py
index 8578ae01..6ad67aac 100644
--- a/ereuse_devicehub/views.py
+++ b/ereuse_devicehub/views.py
@@ -28,7 +28,9 @@ class LoginView(View):
             if not is_safe_url(flask.request, next_url):
                 return flask.abort(400)
 
-            return flask.redirect(next_url or flask.url_for('core.user-profile'))
+            return flask.redirect(
+                next_url or flask.url_for('inventory.devices.devicelist')
+            )
         return flask.render_template('ereuse_devicehub/user_login.html', form=form)
 
 

From 26f3a64b46393313d352966045a704c196b1db31 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Fri, 25 Feb 2022 12:25:00 +0100
Subject: [PATCH 2/3] there are views than doesn't have any lot on sidebar
 because lots are missing as template context

---
 ereuse_devicehub/inventory/views.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py
index 1eae4de2..d324d3cc 100644
--- a/ereuse_devicehub/inventory/views.py
+++ b/ereuse_devicehub/inventory/views.py
@@ -133,7 +133,8 @@ class LotCreateView(View):
             return flask.redirect(next_url)
 
         lots = Lot.query.filter(Lot.owner_id == current_user.id)
-        return flask.render_template(self.template_name, form=form, title=self.title, lots=lots)
+        context = {'form': form, 'title': self.title, 'lots': lots}
+        return flask.render_template(self.template_name, **context)
 
 
 class LotUpdateView(View):
@@ -150,7 +151,8 @@ class LotUpdateView(View):
             return flask.redirect(next_url)
 
         lots = Lot.query.filter(Lot.owner_id == current_user.id)
-        return flask.render_template(self.template_name, form=form, title=self.title, lots=lots)
+        context = {'form': form, 'title': self.title, 'lots': lots}
+        return flask.render_template(self.template_name, **context)
 
 
 class LotDeleteView(View):
@@ -171,13 +173,13 @@ class UploadSnapshotView(View):
     template_name = 'inventory/upload_snapshot.html'
 
     def dispatch_request(self):
-        context = {'page_title': 'Upload Snapshot'}
         lots = Lot.query.filter(Lot.owner_id == current_user.id).all()
         form = UploadSnapshotForm()
+        context = {'page_title': 'Upload Snapshot', 'lots': lots, 'form': form}
         if form.validate_on_submit():
             form.save()
 
-        return flask.render_template(self.template_name, form=form, lots=lots, **context)
+        return flask.render_template(self.template_name, **context)
 
 
 class DeviceCreateView(View):
@@ -186,15 +188,15 @@ class DeviceCreateView(View):
     template_name = 'inventory/device_create.html'
 
     def dispatch_request(self):
-        context = {'page_title': 'New Device'}
         lots = Lot.query.filter(Lot.owner_id == current_user.id).all()
         form = NewDeviceForm()
+        context = {'page_title': 'New Device', 'lots': lots, 'form': form}
         if form.validate_on_submit():
             form.save()
             next_url = url_for('inventory.devices.devicelist')
             return flask.redirect(next_url)
 
-        return flask.render_template(self.template_name, form=form, lots=lots, **context)
+        return flask.render_template(self.template_name, **context)
 
 
 class TagListView(View):
@@ -203,9 +205,10 @@ class TagListView(View):
     template_name = 'inventory/tag_list.html'
 
     def dispatch_request(self):
+        lots = Lot.query.filter(Lot.owner_id == current_user.id)
         tags = Tag.query.filter(Tag.owner_id == current_user.id)
         context = {
-            'lots': [],
+            'lots': lots,
             'tags': tags,
             'page_title': 'Tags Management',
         }
@@ -218,7 +221,8 @@ class TagAddView(View):
     template_name = 'inventory/tag_create.html'
 
     def dispatch_request(self):
-        context = {'page_title': 'New Tag'}
+        lots = Lot.query.filter(Lot.owner_id == current_user.id)
+        context = {'page_title': 'New Tag', 'lots': lots}
         form = TagForm()
         if form.validate_on_submit():
             form.save()
@@ -234,7 +238,8 @@ class TagAddUnnamedView(View):
     template_name = 'inventory/tag_create_unnamed.html'
 
     def dispatch_request(self):
-        context = {'page_title': 'New Unnamed Tag'}
+        lots = Lot.query.filter(Lot.owner_id == current_user.id)
+        context = {'page_title': 'New Unnamed Tag', 'lots': lots}
         form = TagUnnamedForm()
         if form.validate_on_submit():
             form.save()
@@ -280,6 +285,7 @@ class TagUnlinkDeviceView(View):
     template_name = 'inventory/tag_unlink_device.html'
 
     def dispatch_request(self, id):
+        lots = Lot.query.filter(Lot.owner_id == current_user.id)
         form = TagDeviceForm(delete=True, device=id)
         if form.validate_on_submit():
             form.remove()
@@ -287,7 +293,7 @@ class TagUnlinkDeviceView(View):
             next_url = url_for('inventory.devices.devicelist')
             return flask.redirect(next_url)
 
-        return flask.render_template(self.template_name, form=form, referrer=request.referrer)
+        return flask.render_template(self.template_name, form=form, lots=lots, referrer=request.referrer)
 
 
 class NewActionView(View):

From b85f4f298cc2547fb326bdca3338afe5daa45144 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Fri, 25 Feb 2022 12:27:14 +0100
Subject: [PATCH 3/3] pre-commit

---
 ereuse_devicehub/inventory/views.py | 102 ++++++++++++++++++++--------
 1 file changed, 72 insertions(+), 30 deletions(-)

diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py
index d324d3cc..cb80b895 100644
--- a/ereuse_devicehub/inventory/views.py
+++ b/ereuse_devicehub/inventory/views.py
@@ -4,11 +4,18 @@ from flask.views import View
 from flask_login import current_user, login_required
 
 from ereuse_devicehub import messages
-from ereuse_devicehub.inventory.forms import (AllocateForm, LotDeviceForm,
-                                              LotForm, NewActionForm,
-                                              NewDeviceForm, TagDeviceForm,
-                                              TagForm, TagUnnamedForm,
-                                              UploadSnapshotForm, DataWipeForm)
+from ereuse_devicehub.inventory.forms import (
+    AllocateForm,
+    DataWipeForm,
+    LotDeviceForm,
+    LotForm,
+    NewActionForm,
+    NewDeviceForm,
+    TagDeviceForm,
+    TagForm,
+    TagUnnamedForm,
+    UploadSnapshotForm,
+)
 from ereuse_devicehub.resources.device.models import Device
 from ereuse_devicehub.resources.lot.models import Lot
 from ereuse_devicehub.resources.tag.model import Tag
@@ -27,8 +34,11 @@ class DeviceListMix(View):
         filter_types = ['Desktop', 'Laptop', 'Server']
         lots = Lot.query.filter(Lot.owner_id == current_user.id)
         lot = None
-        tags = Tag.query.filter(Tag.owner_id == current_user.id).filter(
-            Tag.device_id == None).order_by(Tag.created.desc())
+        tags = (
+            Tag.query.filter(Tag.owner_id == current_user.id)
+            .filter(Tag.device_id == None)
+            .order_by(Tag.created.desc())
+        )
 
         if lot_id:
             lot = lots.filter(Lot.id == lot_id).one()
@@ -38,10 +48,12 @@ class DeviceListMix(View):
             form_new_allocate = AllocateForm(lot=lot.id)
             form_new_datawipe = DataWipeForm(lot=lot.id)
         else:
-            devices = Device.query.filter(
-                Device.owner_id == current_user.id).filter(
-                Device.type.in_(filter_types)).filter(Device.lots == None).order_by(
-                    Device.updated.desc())
+            devices = (
+                Device.query.filter(Device.owner_id == current_user.id)
+                .filter(Device.type.in_(filter_types))
+                .filter(Device.lots == None)
+                .order_by(Device.updated.desc())
+            )
             form_new_action = NewActionForm()
             form_new_allocate = AllocateForm()
             form_new_datawipe = DataWipeForm()
@@ -61,14 +73,13 @@ class DeviceListMix(View):
             'form_new_datawipe': form_new_datawipe,
             'lot': lot,
             'tags': tags,
-            'list_devices': list_devices
+            'list_devices': list_devices,
         }
 
         return self.context
 
 
 class DeviceListView(DeviceListMix):
-
     def dispatch_request(self, lot_id=None):
         self.get_context(lot_id)
         return flask.render_template(self.template_name, **self.context)
@@ -80,8 +91,11 @@ class DeviceDetailView(View):
 
     def dispatch_request(self, id):
         lots = Lot.query.filter(Lot.owner_id == current_user.id)
-        device = Device.query.filter(
-            Device.owner_id == current_user.id).filter(Device.devicehub_id == id).one()
+        device = (
+            Device.query.filter(Device.owner_id == current_user.id)
+            .filter(Device.devicehub_id == id)
+            .one()
+        )
 
         context = {
             'device': device,
@@ -255,8 +269,9 @@ class TagDetailView(View):
 
     def dispatch_request(self, id):
         lots = Lot.query.filter(Lot.owner_id == current_user.id)
-        tag = Tag.query.filter(
-            Tag.owner_id == current_user.id).filter(Tag.id == id).one()
+        tag = (
+            Tag.query.filter(Tag.owner_id == current_user.id).filter(Tag.id == id).one()
+        )
 
         context = {
             'lots': lots,
@@ -293,7 +308,9 @@ class TagUnlinkDeviceView(View):
             next_url = url_for('inventory.devices.devicelist')
             return flask.redirect(next_url)
 
-        return flask.render_template(self.template_name, form=form, lots=lots, referrer=request.referrer)
+        return flask.render_template(
+            self.template_name, form=form, lots=lots, referrer=request.referrer
+        )
 
 
 class NewActionView(View):
@@ -361,21 +378,46 @@ class NewDataWipeView(NewActionView, DeviceListMix):
 
 
 devices.add_url_rule('/action/add/', view_func=NewActionView.as_view('action_add'))
-devices.add_url_rule('/action/allocate/add/', view_func=NewAllocateView.as_view('allocate_add'))
-devices.add_url_rule('/action/datawipe/add/', view_func=NewDataWipeView.as_view('datawipe_add'))
+devices.add_url_rule(
+    '/action/allocate/add/', view_func=NewAllocateView.as_view('allocate_add')
+)
+devices.add_url_rule(
+    '/action/datawipe/add/', view_func=NewDataWipeView.as_view('datawipe_add')
+)
 devices.add_url_rule('/device/', view_func=DeviceListView.as_view('devicelist'))
-devices.add_url_rule('/device/<string:id>/', view_func=DeviceDetailView.as_view('device_details'))
-devices.add_url_rule('/lot/<string:lot_id>/device/', view_func=DeviceListView.as_view('lotdevicelist'))
-devices.add_url_rule('/lot/devices/add/', view_func=LotDeviceAddView.as_view('lot_devices_add'))
-devices.add_url_rule('/lot/devices/del/', view_func=LotDeviceDeleteView.as_view('lot_devices_del'))
+devices.add_url_rule(
+    '/device/<string:id>/', view_func=DeviceDetailView.as_view('device_details')
+)
+devices.add_url_rule(
+    '/lot/<string:lot_id>/device/', view_func=DeviceListView.as_view('lotdevicelist')
+)
+devices.add_url_rule(
+    '/lot/devices/add/', view_func=LotDeviceAddView.as_view('lot_devices_add')
+)
+devices.add_url_rule(
+    '/lot/devices/del/', view_func=LotDeviceDeleteView.as_view('lot_devices_del')
+)
 devices.add_url_rule('/lot/add/', view_func=LotCreateView.as_view('lot_add'))
-devices.add_url_rule('/lot/<string:id>/del/', view_func=LotDeleteView.as_view('lot_del'))
+devices.add_url_rule(
+    '/lot/<string:id>/del/', view_func=LotDeleteView.as_view('lot_del')
+)
 devices.add_url_rule('/lot/<string:id>/', view_func=LotUpdateView.as_view('lot_edit'))
-devices.add_url_rule('/upload-snapshot/', view_func=UploadSnapshotView.as_view('upload_snapshot'))
+devices.add_url_rule(
+    '/upload-snapshot/', view_func=UploadSnapshotView.as_view('upload_snapshot')
+)
 devices.add_url_rule('/device/add/', view_func=DeviceCreateView.as_view('device_add'))
 devices.add_url_rule('/tag/', view_func=TagListView.as_view('taglist'))
 devices.add_url_rule('/tag/add/', view_func=TagAddView.as_view('tag_add'))
-devices.add_url_rule('/tag/unnamed/add/', view_func=TagAddUnnamedView.as_view('tag_unnamed_add'))
-devices.add_url_rule('/tag/<string:id>/', view_func=TagDetailView.as_view('tag_details'))
-devices.add_url_rule('/tag/devices/add/', view_func=TagLinkDeviceView.as_view('tag_devices_add'))
-devices.add_url_rule('/tag/devices/<int:id>/del/', view_func=TagUnlinkDeviceView.as_view('tag_devices_del'))
+devices.add_url_rule(
+    '/tag/unnamed/add/', view_func=TagAddUnnamedView.as_view('tag_unnamed_add')
+)
+devices.add_url_rule(
+    '/tag/<string:id>/', view_func=TagDetailView.as_view('tag_details')
+)
+devices.add_url_rule(
+    '/tag/devices/add/', view_func=TagLinkDeviceView.as_view('tag_devices_add')
+)
+devices.add_url_rule(
+    '/tag/devices/<int:id>/del/',
+    view_func=TagUnlinkDeviceView.as_view('tag_devices_del'),
+)