radarsys Commit - r355:47d9fcc6d49c · Jicamarca Repository

Se logró levantar la web con los 5 submenus superiores arreglando incompatibilidades

Renato-TUF -

r355:47d9fcc6d49c

parent child

Context file:

r355:47d9fcc6d49c

Expand all files

apps/abs/templates/abs_add_beam.html +1 -1

             {% extends "dev_conf_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}

apps/abs/templates/abs_beam_values.html +1 -1

             {% load static %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load main_tags %}
             {% block content %}

apps/abs/templates/abs_beams_list.html +1 -1

@@ -1,4 +1,4
1	{% load bootstrap4 %}	1	{% load django_bootstrap5 %}
2		2
3	{% if abs_beams %}	3	{% if abs_beams %}
4		4

apps/abs/templates/abs_conf.html +1 -1

-            {% extends "dev_conf.html" %} {% load static %} {% load bootstrap4 %} {% load main_tags %}
+            {% extends "dev_conf.html" %} {% load static %} {% load django_bootstrap5 %} {% load main_tags %}
             {% block extra-head %}
             <style>
               .abs {

apps/abs/templates/abs_conf_edit.html +1 -1

             {% extends "dev_conf_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% block extra-head %}

apps/abs/templates/abs_downpattern_img.html +1 -1

             {% load static %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load main_tags %}
             {% block content %}

apps/abs/templates/abs_edit_beam.html +1 -1

             {% extends "dev_conf_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}

apps/abs/templates/abs_pattern.html +1 -1

             {% load static %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load main_tags %}
             {% block content %}

apps/abs/templates/abs_patterns.html +1 -1

             {% extends "dev_conf.html" %}
             {% load static %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load main_tags %}
             {% block content %}

apps/abs/templates/abs_uppattern_img.html +1 -1

             {% load static %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load main_tags %}
             {% block content %}

apps/abs/views.py +1 -1

-            from django.shortcuts import render_to_response
+            from django.shortcuts import render
             from django.template import RequestContext
             from django.shortcuts import redirect, render, get_object_or_404
             from django.contrib import messages

apps/accounts/templates/login.html +2 -4

             {% extends "base.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% block mainactive %}active{% endblock %}
             {% block content-title %}SIR{% endblock %}
               {% csrf_token %}
               {% bootstrap_form form %}
               <input type="hidden" name="next" value="{{ next }}" />
-              {% buttons %}
+              {% bootstrap_button "Login" button_type="submit" button_class="btn-primary" %}
-                <button type="submit" class="btn btn-primary">Login</button>
-              {% endbuttons %}
               </form>
             </div>
             {% endblock %}

apps/accounts/views.py +1 -1

-            from django.shortcuts import render,render_to_response
+            from django.shortcuts import render
             from django.template import RequestContext
             # Create your views here.

apps/cgs/templates/cgs_conf_edit.html +1 -1

             {% extends "dev_conf_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}

apps/cgs/templates/cgs_conf_import.html +1 -1

             {% extends "dev_conf_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}

apps/cgs/templates/index_cgs.html +1 -1

             {% extends "base.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% block mainactive %}active{% endblock %}
             {% block content-title %}DEVICE CGS{% endblock %}

apps/dds/templates/dds_conf_edit.html +1 -1

             {% extends "dev_conf_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}

apps/dds/templates/dds_conf_import.html +1 -1

             {% extends "dev_conf_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}

apps/dds_rest/templates/dds_rest_conf_edit - Copy.html +1 -1

             {% extends "dev_conf_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}

apps/dds_rest/templates/dds_rest_conf_edit.html +1 -1

             {% extends "dev_conf_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}

apps/dds_rest/templates/dds_rest_conf_import.html +1 -1

             {% extends "dev_conf_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}

apps/jars/templates/jars.html +1 -1

             {% extends "base.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% block mainactive %}active{% endblock %}
             {% block content-title %}Acquisition System{% endblock %}

apps/jars/templates/jars_conf.html +1 -1

             {% extends "dev_conf.html" %}
             {% load static %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load main_tags %}
             {% block extra-menu-actions %}

apps/jars/templates/jars_conf_edit.html +1 -1

             {% extends "dev_conf_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}

apps/jars/views.py +1 -1

-            from django.shortcuts import render_to_response
+            from django.shortcuts import render
             from django.template import RequestContext
             from django.shortcuts import redirect, render, get_object_or_404
             from django.contrib import messages

apps/main/templates/base - mod.html +1 -1

             <!DOCTYPE html>
             {% load static %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             <html lang="en">
             <head>
                 <meta charset="utf-8">

apps/main/templates/base.html +1 -1

             <!DOCTYPE html>
             {% load static %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             <html lang="en">
             <head>
                 <meta charset="utf-8">

apps/main/templates/base_edit.html +1 -1

             {% extends "base.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}

apps/main/templates/base_list.html +2 -2

             {% extends "base.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}
             {% block content-filter %}
             {% if form %}
             <form class="form" method="get">
-              {% bootstrap_form form layout='horizontal' size='medium' %}
+              {% bootstrap_form form layout='horizontal' size='md' %}
               <div class="pull-right">
                 <br>
               <button type="button" class="btn btn-primary btn-sm" onclick="window.location.replace('?');"><span class="fas fa-sync-alt" aria-hidden="true"></span></button>

apps/main/templates/campaign.html +1 -1

             {% extends "base.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}

apps/main/templates/campaign_edit.html +1 -1

             {% extends "base_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}

apps/main/templates/confirm.html +1 -1

             {% extends 'base.html' %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}

apps/main/templates/dev_conf.html +1 -1

             {% extends "base.html" %}
-            {% load bootstrap4 %}
+            {% load bootstrap5 %}
             {% load static %}
             {% load main_tags %}
             {% block content-title %}{{title}}{% endblock %}

apps/main/templates/dev_conf_edit.html +1 -1

             {% extends "base_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}

apps/main/templates/device.html +1 -1

             {% extends "base.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}
             {% block content-title %}{{title}}{% endblock %}

apps/main/templates/experiment.html +1 -1

             {% extends "base.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}

apps/main/templates/experiment_edit.html +1 -1

             {% extends "base_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}

apps/main/templates/experiment_mix.html +1 -1

             {% extends "base_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}

apps/main/templates/experiment_summary.html +1 -1

             {% extends "base.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}

apps/main/templates/experiment_verify.html +1 -1

             {% extends "base.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}

apps/main/templates/footer_igp.html +1 -1

-            {% load static %} {% load bootstrap4 %}
+            {% load static %} {% load django_bootstrap5 %}
             <footer>
                 <div class="container">
                     <ul class="footer-contact">

apps/main/templates/header_igp.html +1 -1

-            {% load static %} {% load bootstrap4 %}
+            {% load static %} {% load django_bootstrap5 %}
             <div id="igp-top">
                 <div class="container">

apps/main/templates/index.html +1 -1

             {% extends "base.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% block content-title %}Integrated Radar System{% endblock %}
             {% block content-suptitle %}at JRO{% endblock %}

apps/main/templates/location.html +1 -1

             {% extends "base.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}

apps/main/templates/operation.html +1 -1

             {% extends "base.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}

apps/main/urls.py +2 -2

                 path('operation/', views.operation, name='url_operation'),
                 path('operation/<int:id_camp>/', views.operation, name='url_operation'),
-                path('operation/<int:id_camp>/revoke', views.revoke_tasks, name='url_operation_revoke'),
+                #path('operation/<int:id_camp>/revoke', views.revoke_tasks, name='url_operation_revoke'),
-                path('operation/<int:id_camp>/show', views.show_tasks, name='url_operation_show'),
+                #path('operation/<int:id_camp>/show', views.show_tasks, name='url_operation_show'),
                 path('operation/<int:id_camp>/radar/<int:id_radar>/start/', views.radar_start, name='url_radar_start'),
                 path('operation/<int:id_camp>/radar/<int:id_radar>/stop/', views.radar_stop, name='url_radar_stop'),
                 path('operation/<int:id_camp>/radar/<int:id_radar>/refresh/', views.radar_refresh, name='url_radar_refresh'),

apps/main/views.py +64 -64

@@ -41,7 +41,7 from apps.rc.models import RCConfiguration, RCLine, RCLineType, RCClock
41	from apps.dds.models import DDSConfiguration	41	from apps.dds.models import DDSConfiguration
42	from apps.dds_rest.models import DDSRestConfiguration	42	from apps.dds_rest.models import DDSRestConfiguration
43		43
44	from .tasks import task_start	44	#from .tasks import task_start
45	from radarsys.celery import app	45	from radarsys.celery import app
46		46
47	#comentario test	47	#comentario test
@@ -1843,9 +1843,9 def radar_start(request, id_camp, id_radar):
1843		1843
1844	# -------------------------------------------	1844	# -------------------------------------------
1845		1845
1846	task = task_start.delay(exp.id)	1846	# task = task_start.delay(exp.id)
1847	exp.task = task.id	1847	# exp.task = task.id
1848	exp.status = task.get()	1848	# exp.status = task.get()
1849	# -------------------------------------------	1849	# -------------------------------------------
1850		1850
1851	#exp.status = task.wait()	1851	#exp.status = task.wait()
@@ -1857,9 +1857,9 def radar_start(request, id_camp, id_radar):
1857	elif now < start:	1857	elif now < start:
1858	print("Caso now <= start -- (2)",exp.pk)	1858	print("Caso now <= start -- (2)",exp.pk)
1859	#task = task_start.apply_async((exp.pk, ), eta=start)#start+timedelta(hours=5))	1859	#task = task_start.apply_async((exp.pk, ), eta=start)#start+timedelta(hours=5))
1860	task = task_start.apply_async((exp.pk, ), eta=start+timedelta(hours=5))#)	1860	# task = task_start.apply_async((exp.pk, ), eta=start+timedelta(hours=5))#)
1861	exp.task = task.id	1861	# exp.task = task.id
1862	exp.status = 3	1862	# exp.status = 3
1863	messages.success(request, 'Experiment {} programmed to start at {}'.format(exp, start))	1863	messages.success(request, 'Experiment {} programmed to start at {}'.format(exp, start))
1864	else:	1864	else:
1865	print("Caso now > end -- (3)")	1865	print("Caso now > end -- (3)")
@@ -1878,21 +1878,21 def radar_stop(request, id_camp, id_radar):
1878	campaign = get_object_or_404(Campaign, pk=id_camp)	1878	campaign = get_object_or_404(Campaign, pk=id_camp)
1879	experiments = campaign.get_experiments_by_radar(id_radar)[0]['experiments']	1879	experiments = campaign.get_experiments_by_radar(id_radar)[0]['experiments']
1880	print("Ingreso en stop radar_stop")	1880	print("Ingreso en stop radar_stop")
1881	for exp in experiments:	1881	#for exp in experiments:
1882		1882
1883	if exp.task:	1883	# if exp.task:
1884	print("Ingreso antes de revoke stop")	1884	# print("Ingreso antes de revoke stop")
1885	app.control.revoke(exp.task)	1885	# app.control.revoke(exp.task)
1886		1886
1887		1887
1888	if exp.status == 2: #status 2 es started	1888	# if exp.status == 2: #status 2 es started
1889	print("llama a exp.stop")	1889	# print("llama a exp.stop")
1890	exp.stop()	1890	# exp.stop()
1891	messages.warning(request, 'Experiment {} stopped'.format(exp))	1891	# messages.warning(request, 'Experiment {} stopped'.format(exp))
1892	exp.status = 1	1892	# exp.status = 1
1893	exp.save()	1893	# exp.save()
1894		1894
1895	return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))	1895	#return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))
1896		1896
1897		1897
1898	@login_required	1898	@login_required
@@ -1908,52 +1908,52 def radar_refresh(request, id_camp, id_radar):
1908	scheduled = list(i.scheduled().values())[0]	1908	scheduled = list(i.scheduled().values())[0]
1909	revoked = list(i.revoked().values())[0]	1909	revoked = list(i.revoked().values())[0]
1910		1910
1911	for exp in experiments:	1911	# for exp in experiments:
1912	if exp.task in revoked:	1912	# if exp.task in revoked:
1913	exp.status = 1	1913	# exp.status = 1
1914	elif exp.task in [t['request']['id'] for t in scheduled if 'task_stop' in t['request']['name']]:	1914	# elif exp.task in [t['request']['id'] for t in scheduled if 'task_stop' in t['request']['name']]:
1915	exp.status = 2	1915	# exp.status = 2
1916	elif exp.task in [t['request']['id'] for t in scheduled if 'task_start' in t['request']['name']]:	1916	# elif exp.task in [t['request']['id'] for t in scheduled if 'task_start' in t['request']['name']]:
1917	exp.status = 3	1917	# exp.status = 3
1918	else:	1918	# else:
1919	exp.status = 4	1919	# exp.status = 4
1920	exp.save()	1920	# exp.save()
1921	return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))	1921	# return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))
1922		1922
1923	@login_required	1923	#@login_required
1924	def revoke_tasks(request, id_camp):	1924	# def revoke_tasks(request, id_camp):
1925		1925
1926	i = app.control.inspect()	1926	# i = app.control.inspect()
1927	scheduled = list(i.scheduled().values())[0]	1927	# scheduled = list(i.scheduled().values())[0]
1928	revoked = list(i.revoked().values())[0]	1928	# revoked = list(i.revoked().values())[0]
1929		1929
1930	for t in scheduled:	1930	# for t in scheduled:
1931	if t['request']['id'] in revoked:	1931	# if t['request']['id'] in revoked:
1932	continue	1932	# continue
1933	app.control.revoke(t['request']['id'])	1933	# app.control.revoke(t['request']['id'])
1934	exp = Experiment.objects.get(pk=eval(str(t['request']['args']))[0])	1934	# exp = Experiment.objects.get(pk=eval(str(t['request']['args']))[0])
1935	eta = t['eta']	1935	# eta = t['eta']
1936	task = t['request']['name'].split('.')[-1]	1936	# #task = t['request']['name'].split('.')[-1]
1937	messages.warning(request, 'Scheduled {} at {} for experiment {} revoked'.format(task, eta, exp.name))	1937	# messages.warning(request, 'Scheduled {} at {} for experiment {} revoked'.format(task, eta, exp.name))
1938		1938
1939	return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))	1939	# return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))
1940		1940
1941	@login_required	1941	# @login_required
1942	def show_tasks(request, id_camp):	1942	# def show_tasks(request, id_camp):
1943		1943
1944	i = app.control.inspect()	1944	# i = app.control.inspect()
1945	scheduled = list(i.scheduled().values())[0]	1945	# scheduled = list(i.scheduled().values())[0]
1946	revoked = list(i.revoked().values())[0]	1946	# revoked = list(i.revoked().values())[0]
1947		1947
1948	for t in scheduled:	1948	# for t in scheduled:
1949	if t['request']['id'] in revoked:	1949	# if t['request']['id'] in revoked:
1950	continue	1950	# continue
1951	exp = Experiment.objects.get(pk=eval(str(t['request']['args']))[0])	1951	# exp = Experiment.objects.get(pk=eval(str(t['request']['args']))[0])
1952	eta = t['eta']	1952	# eta = t['eta']
1953	task = t['request']['name'].split('.')[-1]	1953	# #task = t['request']['name'].split('.')[-1]
1954	messages.success(request, 'Task {} scheduled at {} for experiment {}'.format(task, eta, exp.name))	1954	# #messages.success(request, 'Task {} scheduled at {} for experiment {}'.format(task, eta, exp.name))
1955		1955
1956	return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))	1956	# return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))
1957		1957
1958	def real_time(request):	1958	def real_time(request):
1959		1959

apps/rc/templates/rc_conf.html +1 -1

             {% extends "dev_conf.html" %}
             {% load static %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load main_tags %}
             {% block extra-menu-actions %}

apps/rc/templates/rc_conf_edit.html +1 -1

             {% extends "dev_conf_edit.html" %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load static %}
             {% block extra-head %}

apps/rc/templates/rc_lines.html +1 -1

-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             <div class="pull-right"><button id="bt_toggle" type="button" class="btn btn-default btn-xs" >
             Expand/Collapse
             </button></div><br><br>

apps/rc/templates/rc_pulses.html +1 -1

             {% extends "dev_conf.html" %}
             {% load static %}
-            {% load bootstrap4 %}
+            {% load django_bootstrap5 %}
             {% load main_tags %}
             {% block extra-head %}

radarsys/settings.py +2 -2

                 'django.contrib.sessions',
                 'django.contrib.messages',
                 'django.contrib.staticfiles',
-                "django_bootstrap5",
+                'django_bootstrap5',
+                'graphene_django',
                 'polymorphic',
                 'apps.accounts',
                 'apps.main',
                 'apps.abs',
                 'apps.cgs',
                 'apps.dds_rest',
-                'graphene_django',
             ]
             MIDDLEWARE = [

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages