irie 0.0.27__py3-none-any.whl → 0.0.29__py3-none-any.whl

irie/apps/admin_dash/views.py

@@ -0,0 +1,113 @@
+from django.shortcuts import render, redirect
+from irie.apps.admin_dash.forms import LoginForm, RegistrationForm, UserPasswordResetForm, UserSetPasswordForm, UserPasswordChangeForm
+from django.contrib.auth import logout
+from django.contrib.auth import views as auth_views
+
+def index(request):
+    context = {
+        'segment': 'dashboard'
+    }
+    return render(request, 'pages/index.html', context)
+
+def tables(request):
+    context = {
+        'segment': 'tables'
+    }
+    return render(request, 'pages/tables.html', context)
+
+
+def billing(request):
+    context = {
+        'segment': 'billing'
+    }
+    return render(request, 'pages/billing.html', context)
+
+def virtual_reality(request):
+    context = {
+        'segment': 'virtual_reality'
+    }
+    return render(request, 'pages/virtual-reality.html', context)
+
+def rtl(request):
+    context = {
+        'segment': 'rtl'
+    }
+    return render(request, 'pages/rtl.html', context)
+
+def notifications(request):
+    context = {
+        'segment': 'notifications'
+    }
+    return render(request, 'pages/notifications.html', context)
+
+def profile(request):
+    context = {
+        'segment': 'profile'
+    }
+    return render(request, 'pages/profile.html', context)
+
+
+def map(request):
+    context = {
+        'segment': 'map'
+    }
+    return render(request, 'pages/map.html', context)
+
+def typography(request):
+    context = {
+        'segment': 'typography'
+    }
+    return render(request, 'pages/typography.html', context)
+
+def icons(request):
+    context = {
+        'segment': 'icons'
+    }
+    return render(request, 'pages/icons.html', context)
+
+def template(request):
+    context = {
+        'segment': 'template'
+    }
+    return render(request, 'pages/template.html', context)
+
+
+class UserLoginView(auth_views.LoginView):
+  template_name = 'pages/sign-in.html'
+  form_class = LoginForm
+  success_url = '/'
+
+def register(request):
+  if request.method == 'POST':
+    form = RegistrationForm(request.POST)
+    if form.is_valid():
+      form.save()
+      print('Account created successfully!')
+      return redirect('/accounts/login/')
+    else:
+      print("Registration failed!")
+  else:
+    form = RegistrationForm()
+  
+  context = {'form': form}
+  return render(request, 'pages/sign-up.html', context)
+
+
+class UserPasswordResetView(auth_views.PasswordResetView):
+  template_name = 'accounts/forgot-password.html'
+  form_class = UserPasswordResetForm
+
+
+class UserPasswordResetConfirmView(auth_views.PasswordResetConfirmView):
+  template_name = 'accounts/recover-password.html'
+  form_class = UserSetPasswordForm
+
+
+class UserPasswordChangeView(auth_views.PasswordChangeView):
+  template_name = 'accounts/password_change.html'
+  form_class = UserPasswordChangeForm
+
+
+def user_logout_view(request):
+  logout(request)
+  return redirect('/accounts/login/')

irie/apps/events/views.py

@@ -15,14 +15,14 @@ def event_table(request):
     """
     context = {}
     page_template = "event-table.html"
-    context["segment"] = "event-table.html"
+    context["segment"] = "events"
 
     page = request.GET.get("page", 1)
     try:
         page = int(page)
     except:
         page = 1
-    
+
     asset = request.GET.get("asset", None)
 
     if asset is not None:
@@ -31,9 +31,8 @@ def event_table(request):
     else:
         events = [i for i in sorted(EventRecord.objects.all(),
                              key=lambda x: x.motion_data["event_date"], reverse=True)]
-    
-    # Paginator for 10 items per page
-    paginator = Paginator(events, 15)
+
+    paginator = Paginator(events, 5)
 
 
 # reversed(sorted(Event.objects.all(),

irie/apps/inventory/filters.py

@@ -4,7 +4,7 @@ from django.forms import CheckboxInput
 class AssetFilter(django_filters.FilterSet):
     search = django_filters.CharFilter(
         lookup_expr="icontains", 
-        field_name="name",
+        field_name="calid",
         label='Search'
     )
 

irie/apps/inventory/migrations/0003_asset_notes.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.2 on 2024-12-31 17:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('irie_apps_inventory', '0002_alter_asset_bridge_sensors_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='asset',
+            name='notes',
+            field=models.CharField(blank=True, max_length=1024, null=True),
+        ),
+    ]

irie/apps/inventory/models.py

@@ -24,21 +24,27 @@ class Corridor(models.Model):
 
 class _Sensor: # (models.Model):
     class Status:
-        active: bool 
+        active: bool
 
-    status = None 
+    status = None
 
 class Station: # (models.Model):
-    sensors = None  
+    sensors = None
     assets  = None
     network = None
     events  = None
 
+class Vulnerability: # (models.Model):
+    type    = None
+    asset   = None
+    notes   = models.CharField(max_length=1024, blank=True, null=True)
+
 class Asset(models.Model):
     id = models.BigAutoField(primary_key=True)
     cesmd = models.CharField(max_length=7, blank=True, null=True)
     calid = models.CharField(max_length=15)
-    name  = models.CharField(max_length=100, blank=True)
+    name  = models.CharField(max_length=100,  blank=True)
+    notes = models.CharField(max_length=1024, blank=True, null=True)
 
     is_complete = models.BooleanField(help_text="Is the asset a complete digital twin")
 
@@ -55,7 +61,7 @@ class Asset(models.Model):
 
     def __str__(self):
         return f"{self.calid} - {self.name}"
-    
+
     def get_absolute_url(self):
         return reverse("asset_profile", args=[self.calid])
     

irie/apps/inventory/urls.py

@@ -18,6 +18,7 @@ urlpatterns = [
 
     path("asset-table.html", views.asset_table),
     path("asset-table/",     views.asset_table, name="asset_table"),
+    path("asset_table/export", views.asset_table_export, name="asset_table_export_csv"),
     re_path(
         "^evaluations/(?P<event>[0-9 A-Z-]*)/(?P<cesmd>[0-9 A-Z-]*)/.*", views.asset_event_summary, 
                                                                           name="asset_event_summary"

irie/apps/inventory/views.py

@@ -339,6 +339,47 @@ def _make_tables(asset):
     return tables
 
 
+def _filter_asset_table(request):
+    # Copy the GET parameters and remove the 'page' parameter
+    page_query = request.GET.copy()
+    page_query.pop('page', None)
+
+    filter_set = AssetFilter(request.GET, queryset=Asset.objects.all())
+    order_query = page_query.copy()
+    if order := order_query.pop("order", None):
+        try:
+            assets = filter_set.qs.order_by(order[0])
+        except:
+            assets = sorted(filter_set.qs, key=lambda x: getattr(x, order[0]), reverse=True)
+    else:
+        assets = filter_set.qs
+    return assets, (order_query, page_query, filter_set)
+
+# @login_required(login_url="/login/")
+def asset_table_export(request):
+    """
+    Returns a table of all assets in the database, paginated
+    """
+    import csv
+
+    assets, _ = _filter_asset_table(request)
+    
+    # Create HTTP response with content type as CSV
+    response = HttpResponse(content_type='text/csv')
+    response['Content-Disposition'] = 'attachment; filename="assets.csv"'
+
+    # Write to CSV
+    writer = csv.writer(response)
+    # Write headers (replace with your model field names)
+    writer.writerow(['ID', 'CGS ID', 'Name', 'District', 'Event Count'])
+
+    # Write data rows (customize according to your model fields)
+    for asset in assets:
+        district = asset.nbi_data["NBI_BRIDGE"]["Highway Agency District"].split(" - ")[-1]
+        writer.writerow([asset.calid, asset.cesmd, asset.name, district, asset.event_count])
+
+    return response
+
 
 # @login_required(login_url="/login/")
 def asset_table(request):
@@ -349,26 +390,13 @@ def asset_table(request):
     context = {}
     context["segment"] = "assets"
 
+    assets, (order_query, page_query, filter_set) = _filter_asset_table(request)
     page = request.GET.get("page", 1)
     try:
         page = int(page)
     except:
         page = 1
 
-    # Copy the GET parameters and remove the 'page' parameter
-    page_query = request.GET.copy()
-    page_query.pop('page', None)
-
-    filter_set = AssetFilter(request.GET, queryset=Asset.objects.all())
-    order_query = page_query.copy()
-    if order := order_query.pop("order", None):
-        try:
-            assets = filter_set.qs.order_by(order[0])
-        except:
-            assets = sorted(filter_set.qs, key=lambda x: getattr(x, order[0]), reverse=True)
-    else:
-        assets = filter_set.qs
-
     context["page_query"] = page_query.urlencode()
     context["order_query"] = order_query.urlencode()
     context["bridges"]   = Paginator(assets, 10).get_page(page)
@@ -440,6 +468,7 @@ class AssetMap:
             colors = {}
 
         markers = []
+        top_markers = []
         for b in assets:
             lat, lon = b.coordinates
             popup = folium.Popup(
@@ -447,30 +476,40 @@ class AssetMap:
                             '<a style="display: inline;" target="_blank" href="/inventory/{calid}/">{label}</a>'.format(
                                 calid=b.calid,
                                 label=b.calid
-                            ), 
+                            ),
                             script=True
                         ),
                         min_width= 50,
                         max_width=100
             )
+
+            marker = folium.CircleMarker(
+                        location=[lat, lon],
+                        popup=popup,
+                        color = "blue" if b.is_complete else "black",
+                        fill_color=colors.get(b.id, "blue" if b.is_complete else "gray"),
+                        fill=True,
+                        opacity=1,
+                        fill_opacity=1,
+                        radius=2,
+                        weight=1,
+                        z_index_offset=10 if b.is_complete else 100000
+                    )
             if b.is_complete:
-                markers.append(folium.Marker(
-                    location=[lat, lon],
-                    popup=popup,
-                    icon=folium.Icon(icon="cloud", color="blue" if not b.is_complete else "beige"),
-                    z_index_offset=1000
-                ))
+                marker = folium.Marker(
+                       location=[lat, lon],
+                       popup=popup,
+                       icon=folium.Icon(icon="cloud", color="blue" if not b.is_complete else "beige"),
+                       z_index_offset=1000
+                   )
+                top_markers.append(marker)
+            elif b.calid in {"33-0526G", "33-0395L", "33-0525G", "33-0189L", "33-0523K", "33-0443", "33-0202F", "33-0202R", "33-0524F"}:
+                pass
             else:
-                markers.append(folium.CircleMarker(
-                    location=[lat, lon],
-                    popup=popup,
-                    color="black",
-                    fill_color=colors.get(b.id, "gray"),
-                    fill=True,
-                    opacity=1,
-                    fill_opacity=1,
-                    radius=4,
-                    weight=1,
-                    z_index_offset=800
-                ))
+                markers.append(marker)
+
+            markers.extend(top_markers)
         return markers
+
+    #       top_markers.extend(markers)
+    #   return top_markers