Skip to content

Commit 77603ff

Browse files
committed
introduce ownership type to maps
1 parent e16a642 commit 77603ff

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

cesnet_service_path_plugin/forms/segment.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,5 +762,5 @@ class SegmentBulkEditForm(NetBoxModelBulkEditForm):
762762
comments = CommentField()
763763

764764
model = Segment
765-
fieldsets = (FieldSet("provider", "status", "segment_type", name="Segment"),)
765+
fieldsets = (FieldSet("provider", "status", "ownership_type", "segment_type", name="Segment"),)
766766
nullable_fields = ("comments",)

cesnet_service_path_plugin/templates/cesnet_service_path_plugin/segments_map.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,17 +182,18 @@ <h6 class="card-title mb-0">Selected Segment</h6>
182182
// Status color mapping
183183
const statusColorsLine = {
184184
"Active": "#198754", // Dark Green
185-
"Planned": "#3b82f6", // Blue
185+
"Planned": "#ff8c00", // Dark Orange
186186
"Offline": "#dc3545", // Red
187-
"Maintenance": "#ff8c00", // Dark Orange
187+
"Surveyed": "#3b82f6", // Blue
188188
"Decommissioned": "#6c757d" // Gray
189189
};
190190

191191
const statusBadge = {
192192
"Active": "success",
193193
"Planned": "primary",
194194
"Offline": "danger",
195-
"Decommissioned": "secondary"
195+
"Decommissioned": "secondary",
196+
"Surveyed": "info"
196197
};
197198

198199
// Provider color mapping - generate colors dynamically

cesnet_service_path_plugin/views/segment.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,10 @@ def segment_geojson_api(request, pk):
312312
"provider": str(segment.provider) if segment.provider else None,
313313
"status": segment.get_status_display(),
314314
"status_color": segment.get_status_color(),
315+
"segment_type": segment.get_segment_type_display(),
316+
"segment_type_color": segment.get_segment_type_color(),
317+
"ownership_type": segment.get_ownership_type_display(),
318+
"ownership_type_color": segment.get_ownership_type_color(),
315319
"path_length_km": float(segment.path_length_km) if segment.path_length_km else None,
316320
"install_date": segment.install_date.isoformat() if segment.install_date else None,
317321
"termination_date": segment.termination_date.isoformat() if segment.termination_date else None,
@@ -388,6 +392,8 @@ def get_extra_context(self, request):
388392
"status_color": segment.get_status_color(),
389393
"segment_type": segment.get_segment_type_display(),
390394
"segment_type_color": segment.get_segment_type_color(),
395+
"ownership_type": segment.get_ownership_type_display(),
396+
"ownership_type_color": segment.get_ownership_type_color(),
391397
"path_length_km": float(segment.path_length_km) if segment.path_length_km else None,
392398
"site_a": site_a_data,
393399
"site_b": site_b_data,
@@ -470,6 +476,8 @@ def segments_map_api(request):
470476
"status_color": segment.get_status_color(),
471477
"segment_type": segment.get_segment_type_display(),
472478
"segment_type_color": segment.get_segment_type_color(),
479+
"ownership_type": segment.get_ownership_type_display(),
480+
"ownership_type_color": segment.get_ownership_type_color(),
473481
"path_length_km": float(segment.path_length_km) if segment.path_length_km else None,
474482
"site_a": str(segment.site_a),
475483
"site_b": str(segment.site_b),
@@ -507,6 +515,8 @@ def segments_map_api(request):
507515
"status_color": segment.get_status_color(),
508516
"segment_type": segment.get_segment_type_display(),
509517
"segment_type_color": segment.get_segment_type_color(),
518+
"ownership_type": segment.get_ownership_type_display(),
519+
"ownership_type_color": segment.get_ownership_type_color(),
510520
"path_length_km": float(segment.path_length_km) if segment.path_length_km else None,
511521
"site_a": str(segment.site_a),
512522
"site_b": str(segment.site_b),

0 commit comments

Comments
 (0)