Merge pull request #27 from jasonyates/calendar-widget

0.4.2 Release

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.4.2 (2024-09-29)
+
+* Adding Maintenance calendar widget
+* Fix #26 - f string quote issue with NB 4.1
+
+## 0.4.1 (2024-09-19)
+
+* Adding Maintenance Schedule calendar
+
 
 ## 0.4.0 (2024-09-19)
 

netbox_circuitmaintenance/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = """Jason Yates"""
 __email__ = 'me@jasonyates.co.uk'
-__version__ = '0.4.0'
+__version__ = '0.4.2'
 
 
 from netbox.plugins import PluginConfig

netbox_circuitmaintenance/templates/netbox_circuitmaintenance/calendar_widget.html

@@ -0,0 +1,2 @@
+{% load helpers %}
+{{ calendar }}

netbox_circuitmaintenance/views.py

@@ -122,9 +122,9 @@ def formatday(self, day, weekday, events):
 
             # Format time of the event
             if self.custom_strftime('SU', event.start) == self.custom_strftime('SU', event.end):
-                event_time = f'{self.custom_strftime('%H:%M', event.start)} - {self.custom_strftime('%H:%M', event.end)}'
+                event_time = f'{self.custom_strftime("%H:%M", event.start)} - {self.custom_strftime("%H:%M", event.end)}'
             else:
-                event_time = f'{self.custom_strftime('SU %H:%M', event.start)} - {self.custom_strftime('SU %H:%M', event.end)}'
+                event_time = f'{self.custom_strftime("SU %H:%M", event.start)} - {self.custom_strftime("SU %H:%M", event.end)}'
 
             # Add the event to the day
             events_html += f'<span class="badge text-bg-{event.get_status_color()}"><a href="{event.get_absolute_url()}">{event_time}<br>{event.name} <br>{event.provider} - {event.status}<br>{event.impact_count} Impacted</a></span>'

netbox_circuitmaintenance/widgets.py

@@ -4,9 +4,12 @@
 from django.template.loader import render_to_string
 from .models import CircuitMaintenance 
 from django.db.models import Count
+from .views import Calendar
+import datetime
+from django.utils.safestring import mark_safe
 
 @register_widget
-class ReminderWidget(DashboardWidget):
+class UpcomingMaintenanceWidget(DashboardWidget):
     default_title = 'Upcoming Circuit Maintenance Events'
     description = 'Show a list of upcoming circuit maintenance events'
     template_name = 'netbox_circuitmaintenance/widget.html'
@@ -20,3 +23,22 @@ def render(self, request):
                 impact_count=Count('impact')
             ),
         })
+
+@register_widget
+class MaintenanceCalendarWidget(DashboardWidget):
+    default_title = 'Upcoming Circuit Maintenance Calendar'
+    description = 'Show a simplified calendar view showing upcoming maintenance events this month'
+    template_name = 'netbox_circuitmaintenance/calendar_widget.html'
+    width = 8
+    height = 8
+
+    def render(self, request):
+
+        curr_month = datetime.date.today()
+
+        # Load calendar
+        cal = Calendar()
+        html_calendar = cal.formatmonth(curr_month.year, curr_month.month)
+        html_calendar = html_calendar.replace('<td ', '<td  width="100" height="100"')
+
+        return render_to_string(self.template_name, {"calendar":  mark_safe(html_calendar)})

setup.cfg

@@ -30,7 +30,7 @@ python =
     3.8: py38, format, lint, build
 
 [bumpversion]
-current_version = 0.4.0
+current_version = 0.4.2
 commit = True
 tag = True
 

setup.py

@@ -24,13 +24,12 @@
     ],
     description="NetBox plugin for circuitmaintenance.",
     install_requires=requirements,
-    long_description=readme + '\n\n',
     include_package_data=True,
     keywords='netbox_circuitmaintenance',
     name='netbox_circuitmaintenance',
     packages=find_packages(include=['netbox_circuitmaintenance', 'netbox_circuitmaintenance.*']),
     test_suite='tests',
     url='https://github.com/jasonyates/netbox-circuitmaintenance',
-    version='0.4.0',
+    version='0.4.2',
     zip_safe=False,
 )