irie 0.0.43__py3-none-any.whl → 0.0.45__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of irie might be problematic. Click here for more details.
- irie/apps/inventory/filters.py +10 -7
- irie/apps/inventory/urls.py +1 -1
- irie/apps/inventory/views.py +0 -1
- irie/apps/prediction/views.py +3 -3
- irie/apps/templates/inventory/asset-table.html +14 -0
- {irie-0.0.43.dist-info → irie-0.0.45.dist-info}/METADATA +2 -2
- {irie-0.0.43.dist-info → irie-0.0.45.dist-info}/RECORD +10 -10
- {irie-0.0.43.dist-info → irie-0.0.45.dist-info}/WHEEL +1 -1
- {irie-0.0.43.dist-info → irie-0.0.45.dist-info}/entry_points.txt +0 -0
- {irie-0.0.43.dist-info → irie-0.0.45.dist-info}/top_level.txt +0 -0
irie/apps/inventory/filters.py
CHANGED
|
@@ -9,16 +9,17 @@ class AssetFilter(django_filters.FilterSet):
|
|
|
9
9
|
)
|
|
10
10
|
|
|
11
11
|
cesmd_not_null = django_filters.BooleanFilter(
|
|
12
|
-
label='
|
|
12
|
+
label='Instrumented',
|
|
13
13
|
widget=CheckboxInput(),
|
|
14
14
|
method='filter_cesmd_exists'
|
|
15
15
|
)
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
17
|
+
is_streaming = django_filters.BooleanFilter(
|
|
18
|
+
field_name='is_complete',
|
|
19
|
+
label='Streaming',
|
|
20
|
+
widget=CheckboxInput()
|
|
21
|
+
)
|
|
22
|
+
|
|
22
23
|
district = django_filters.CharFilter(
|
|
23
24
|
label='District',
|
|
24
25
|
method='filter_district'
|
|
@@ -64,6 +65,8 @@ class AssetFilter(django_filters.FilterSet):
|
|
|
64
65
|
def filter_district(self, queryset, name, value):
|
|
65
66
|
return [
|
|
66
67
|
asset for asset in queryset if (
|
|
67
|
-
asset.nbi_data and
|
|
68
|
+
asset.nbi_data and \
|
|
69
|
+
"Highway Agency District" in asset.nbi_data["NBI_BRIDGE"] and \
|
|
70
|
+
asset.nbi_data["NBI_BRIDGE"]["Highway Agency District"] == value
|
|
68
71
|
)
|
|
69
72
|
]
|
irie/apps/inventory/urls.py
CHANGED
|
@@ -20,7 +20,7 @@ urlpatterns = [
|
|
|
20
20
|
path("asset-table/", views.asset_table, name="asset_table"),
|
|
21
21
|
path("asset_table/export", views.asset_table_export, name="asset_table_export_csv"),
|
|
22
22
|
re_path(
|
|
23
|
-
"^evaluations/(?P<event>[0-9 A-Z-]*)/(?P<cesmd>[0-9 A-Z-]*)/.*", views.asset_event_summary,
|
|
23
|
+
"^evaluations/(?P<event>[0-9 A-Z-]*)/(?P<cesmd>[0-9 A-Z-]*)/.*", views.asset_event_summary,
|
|
24
24
|
name="asset_event_summary"
|
|
25
25
|
),
|
|
26
26
|
re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/evaluations/$", views.asset_evals, name="asset_evals"),
|
irie/apps/inventory/views.py
CHANGED
|
@@ -229,7 +229,6 @@ def california_json(request):
|
|
|
229
229
|
return HttpResponse(json.dumps({"type": "FeatureCollection", "features": [cal]}), content_type="application/json")
|
|
230
230
|
|
|
231
231
|
def map_inventory(request):
|
|
232
|
-
|
|
233
232
|
import json
|
|
234
233
|
from irie.apps.inventory.models import Asset
|
|
235
234
|
|
irie/apps/prediction/views.py
CHANGED
|
@@ -100,11 +100,11 @@ def predictor_profile(request, calid, preid):
|
|
|
100
100
|
html_template = loader.get_template("site/page-500.html")
|
|
101
101
|
return HttpResponse(html_template.render(context, request))
|
|
102
102
|
|
|
103
|
-
|
|
104
103
|
@login_required(login_url="/login/")
|
|
105
104
|
def asset_map(request, calid):
|
|
106
|
-
|
|
107
|
-
|
|
105
|
+
"""
|
|
106
|
+
See also https://www.f4map.com/
|
|
107
|
+
"""
|
|
108
108
|
r200 = loader.get_template("inventory/asset-on-map.html")
|
|
109
109
|
r400 = loader.get_template("site/page-400.html")
|
|
110
110
|
asset = Asset.objects.get(calid=calid)
|
|
@@ -155,6 +155,20 @@ table a[href^="https://"]::after
|
|
|
155
155
|
</label>
|
|
156
156
|
</div>
|
|
157
157
|
</div>
|
|
158
|
+
<!-- Streaming check box -->
|
|
159
|
+
<div class="col-12">
|
|
160
|
+
<div class="form-check">
|
|
161
|
+
<input
|
|
162
|
+
type="checkbox"
|
|
163
|
+
name="is_streaming"
|
|
164
|
+
id="is_streaming"
|
|
165
|
+
class="form-check-input"
|
|
166
|
+
{% if filter.form.cesmd_not_null.value %}checked{% endif %}>
|
|
167
|
+
<label for="is_streaming" class="form-check-label">
|
|
168
|
+
{{ filter.form.is_streaming.label }}
|
|
169
|
+
</label>
|
|
170
|
+
</div>
|
|
171
|
+
</div>
|
|
158
172
|
|
|
159
173
|
{# Buttons #}
|
|
160
174
|
<div class="col-12 d-flex justify-content-between">
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
2
|
Name: irie
|
|
3
|
-
Version: 0.0.
|
|
3
|
+
Version: 0.0.45
|
|
4
4
|
Summary: An infrastructure resilience engine
|
|
5
5
|
Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
|
|
6
6
|
Project-URL: Repository, https://github.com/STAIRLab
|
|
@@ -59,13 +59,13 @@ irie/apps/inventory/__init__.py,sha256=wkkNngGxgYcCM745-rlvP6ynrI0b0QN3aWmLWDsR8
|
|
|
59
59
|
irie/apps/inventory/admin.py,sha256=e_W8ls_ARLLf8rn3oJd-YkPdTGMIrcN-mRrxk2BcY3c,472
|
|
60
60
|
irie/apps/inventory/apps.py,sha256=bZ6qYIwPMG4_4IeLfg9N4WuZAEgEVj84oOswV-7_MAI,424
|
|
61
61
|
irie/apps/inventory/fields.py,sha256=J3nTImPsuCeiOWBizSL4tnuKs36sPfXALNTKEZY-wVg,79
|
|
62
|
-
irie/apps/inventory/filters.py,sha256=
|
|
62
|
+
irie/apps/inventory/filters.py,sha256=ZEM4aubBqATThyaUhdFFoZnZBUASGj5pwtsXcgyOz8Q,2295
|
|
63
63
|
irie/apps/inventory/forms.py,sha256=y8tcIGInXDg7KCf1OWd1jtc4umJsm8rf8-4O8nDhNd4,1244
|
|
64
64
|
irie/apps/inventory/models.py,sha256=ie7XhFDujpoyIinmX-YfScVx28SkkRhFadU0iNLC9HI,6073
|
|
65
65
|
irie/apps/inventory/sitemaps.py,sha256=Nha1MTsIH_ad7JyoxwonPytp7MNuEhDNszkEUOmlN0o,826
|
|
66
66
|
irie/apps/inventory/tables.py,sha256=vZdPOcbN1ibuWXqLwbBUoQw9iavwa1GJ5fd83k8bu7Y,27874
|
|
67
|
-
irie/apps/inventory/urls.py,sha256=
|
|
68
|
-
irie/apps/inventory/views.py,sha256=
|
|
67
|
+
irie/apps/inventory/urls.py,sha256=u2LNLB4K4fDq3yPYtREKf3i7_yHRzrTP3cb22G8Brvk,1578
|
|
68
|
+
irie/apps/inventory/views.py,sha256=t-RgtEhSkv1VrvO3d2tvytp81TTlmObQcB2Y04w8zg8,21234
|
|
69
69
|
irie/apps/inventory/archive/CESMD.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
70
70
|
irie/apps/inventory/archive/calid.py,sha256=3L8MbPIGOE3kzDnqeyY055pRBiF2O2l0cmpuDbTsdTg,3014
|
|
71
71
|
irie/apps/inventory/migrations/0001_initial.py,sha256=PwTHv4Q3gqWFha--8Zp9kUOh-cYalB14jXj7RVJUVnw,1786
|
|
@@ -100,7 +100,7 @@ irie/apps/prediction/metrics.py,sha256=Zh1utUZTGddQEVn4e1rLO74tbIz7bVvZli8sgmuB_
|
|
|
100
100
|
irie/apps/prediction/models.py,sha256=S1yLJRgau8TtbOyRTNgeco8FAmEtrhYN6LUrHfrvnpA,2295
|
|
101
101
|
irie/apps/prediction/predictor.py,sha256=-x_4kHWnfUxiX2aQfbl3dsbVAG4lRKAFbo1CqfZNCIc,831
|
|
102
102
|
irie/apps/prediction/urls.py,sha256=rk5Fc9tBNGTfgM86OHVh-cwtawAgaeS1XwxhNB6gIZ8,1046
|
|
103
|
-
irie/apps/prediction/views.py,sha256=
|
|
103
|
+
irie/apps/prediction/views.py,sha256=T-S4XZ6DWjBeXoyaTFbYcfuZScSe7tBnCAx_W0i3s30,7396
|
|
104
104
|
irie/apps/prediction/views_api.py,sha256=DJzLYO5ouPOWkkZJNZxZJzxC3TROKJ-L6Z2IC1NMuFQ,6888
|
|
105
105
|
irie/apps/prediction/migrations/0001_initial.py,sha256=-0GWd2vUUAzSPfptccAJ3raI3UD4Xj9H0E5EJ7xN0Ek,1428
|
|
106
106
|
irie/apps/prediction/migrations/0002_alter_predictormodel_protocol.py,sha256=nrQvuZ1eRR7fR17IjdS0Xyw14y9DpE6HkG2-h7HQ_zA,560
|
|
@@ -398,7 +398,7 @@ irie/apps/templates/inventory/asset-event-summary.html,sha256=5G7uZVf7kVL0wBaAfs
|
|
|
398
398
|
irie/apps/templates/inventory/asset-on-map.html,sha256=LsnvUmTi6TkHSv9sZ_L4KMOwipP_4fkQXDqLUjLS0uo,17062
|
|
399
399
|
irie/apps/templates/inventory/asset-profile.html,sha256=oJiHwQ7ilmRUQy31PMXJgZUPbefJKBNWhjV6IF8UgR0,13576
|
|
400
400
|
irie/apps/templates/inventory/asset-sensors.html,sha256=qLnlhnmOeT5uL1xH67mFPOgufXV_PJ31KEx5Aqt0TTw,2406
|
|
401
|
-
irie/apps/templates/inventory/asset-table.html,sha256=
|
|
401
|
+
irie/apps/templates/inventory/asset-table.html,sha256=hHjZqBBE7FfJPUxVAfpfD4w4C3KiJCdr-rEQHnMbDAE,13204
|
|
402
402
|
irie/apps/templates/inventory/bridge-dashboard.html,sha256=67zrDlih3LOi9xFVwPVZZkgRT3DO-lE_qRL7q8Uz9GY,45472
|
|
403
403
|
irie/apps/templates/inventory/bridge.html,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
|
404
404
|
irie/apps/templates/inventory/dashboard.html,sha256=_qhFiPP6xN-UzZj5NuM5e9NxsgDHJkQ89oXN1cBwhj0,7505
|
|
@@ -486,8 +486,8 @@ irie/init/management/commands/make_asset.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
|
|
|
486
486
|
irie/pull/nbi.py,sha256=KpBjJ9GEU72Qk1t4bGN9cg0QBeVJ8k9XcI3Y1oSgIR0,11478
|
|
487
487
|
irie/rest/__main__.py,sha256=6Nf_-Rr9zGmMyp_wqCFDO7ls9QPnPd9UyUgN17rIGYw,3680
|
|
488
488
|
irie/usgs/__main__.py,sha256=HiSvPn5IW5IqRiCk1qRRq5dCy3-7iISw7v1P_w2rLrk,5049
|
|
489
|
-
irie-0.0.
|
|
490
|
-
irie-0.0.
|
|
491
|
-
irie-0.0.
|
|
492
|
-
irie-0.0.
|
|
493
|
-
irie-0.0.
|
|
489
|
+
irie-0.0.45.dist-info/METADATA,sha256=Sfs8DI6WGsfvEHkGCAHCp256LDnelpkFeHsEBkVOVLc,3207
|
|
490
|
+
irie-0.0.45.dist-info/WHEEL,sha256=tTnHoFhvKQHCh4jz3yCn0WPTYIy7wXx3CJtJ7SJGV7c,91
|
|
491
|
+
irie-0.0.45.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
|
|
492
|
+
irie-0.0.45.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
|
|
493
|
+
irie-0.0.45.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|