radarsys Commit - r19:225e7bf681bc · Jicamarca Repository

views name were changed ...

Miguel Urco -

r19:225e7bf681bc

parent child

Context file:

r19:225e7bf681bc

Collapse all files

apps/abs/urls.py +1 -1

              urlpatterns = (
                  url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_abs_conf'),
-                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_abs_conf'),
+                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_abs_conf'),
              )

apps/cgs/urls.py +1 -1

                  #url(r'^configuration/$', 'apps.cgs.views.configurate_frequencies', name='new_device'),
              #     url(r'^(?P<id>-?\d+)/$', 'apps.cgs.views.configurate_frequencies', name='new_device'),
                  url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_cgs_conf'),
-                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_cgs_conf'),
+                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_cgs_conf'),
              )

apps/dds/urls.py +1 -1

              urlpatterns = (
                  url(r'^(?P<id_conf>-?\d+)/$', 'apps.dds.views.dds_conf', name='url_dds_conf'),
-                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.dds.views.edit_dds_conf', name='url_edit_dds_conf'),
+                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.dds.views.dds_conf_edit', name='url_edit_dds_conf'),
              )

apps/dds/views.py +1 -1

                  return render(request, 'dds_conf.html', kwargs)
-             def edit_dds_conf(request, id_conf):
+             def dds_conf_edit(request, id_conf):
                  conf = DDSConfiguration.objects.get(pk=id_conf)

apps/jars/urls.py +1 -1

              urlpatterns = (
              #     url(r'^(?P<id>-?\d+)/$', 'apps.jars.views.jars_config', name='jars'),
                  url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_jars_conf'),
-                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_jars_conf'),
+                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_jars_conf'),
              )

apps/main/urls.py +12 -12

              from django.conf.urls import url
              urlpatterns = (
-                 url(r'^device/add/$', 'apps.main.views.add_device', name='url_add_device'),
+                 url(r'^device/new/$', 'apps.main.views.device_new', name='url_add_device'),
                  url(r'^device/$', 'apps.main.views.devices', name='url_devices'),
                  url(r'^device/(?P<id_dev>-?\d+)/$', 'apps.main.views.device', name='url_device'),
-                 url(r'^device/(?P<id_dev>-?\d+)/edit/$', 'apps.main.views.edit_device', name='url_edit_device'),
-                 url(r'^device/(?P<id_dev>-?\d+)/delete/$', 'apps.main.views.delete_device', name='url_delete_device'),
+                 url(r'^device/(?P<id_dev>-?\d+)/edit/$', 'apps.main.views.device_edit', name='url_edit_device'),
+                 url(r'^device/(?P<id_dev>-?\d+)/delete/$', 'apps.main.views.device_delete', name='url_delete_device'),
-                 url(r'^campaign/add/$', 'apps.main.views.add_campaign', name='url_add_campaign'),
+                 url(r'^campaign/new/$', 'apps.main.views.campaign_new', name='url_add_campaign'),
                  url(r'^campaign/$', 'apps.main.views.campaigns', name='url_campaigns'),
                  url(r'^campaign/(?P<id_camp>-?\d+)/$', 'apps.main.views.campaign', name='url_campaign'),
-                 url(r'^campaign/(?P<id_camp>-?\d+)/edit/$', 'apps.main.views.edit_campaign', name='url_edit_campaign'),
-                 url(r'^campaign/(?P<id_camp>-?\d+)/delete/$', 'apps.main.views.delete_campaign', name='url_delete_campaign'),
+                 url(r'^campaign/(?P<id_camp>-?\d+)/edit/$', 'apps.main.views.campaign_edit', name='url_edit_campaign'),
+                 url(r'^campaign/(?P<id_camp>-?\d+)/delete/$', 'apps.main.views.campaign_delete', name='url_delete_campaign'),
-                 url(r'^campaign/(?P<id_camp>-?\d+)/add_experiment/$', 'apps.main.views.add_experiment', name='url_add_experiment'),
+                 url(r'^campaign/(?P<id_camp>-?\d+)/new_experiment/$', 'apps.main.views.experiment_new', name='url_add_experiment'),
                  url(r'^experiment/$', 'apps.main.views.experiments', name='url_experiments'),
                  url(r'^experiment/(?P<id_exp>-?\d+)/$', 'apps.main.views.experiment', name='url_experiment'),
-                 url(r'^experiment/(?P<id_exp>-?\d+)/edit/$', 'apps.main.views.edit_experiment', name='url_edit_experiment'),
-                 url(r'^experiment/(?P<id_exp>-?\d+)/delete/$', 'apps.main.views.delete_experiment', name='url_delete_experiment'),
+                 url(r'^experiment/(?P<id_exp>-?\d+)/edit/$', 'apps.main.views.experiment_edit', name='url_edit_experiment'),
+                 url(r'^experiment/(?P<id_exp>-?\d+)/delete/$', 'apps.main.views.experiment_delete', name='url_delete_experiment'),
-                 url(r'^experiment/(?P<id_exp>-?\d+)/add_dev_conf/$', 'apps.main.views.add_dev_conf', name='url_add_dev_conf'),
+                 url(r'^experiment/(?P<id_exp>-?\d+)/new_dev_conf/$', 'apps.main.views.dev_conf_new', name='url_add_dev_conf'),
                  url(r'^dev_conf/$', 'apps.main.views.dev_confs', name='url_dev_confs'),
                  url(r'^dev_conf/(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_dev_conf'),
-                 url(r'^dev_conf/(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_dev_conf'),
-                 url(r'^dev_conf/(?P<id_conf>-?\d+)/delete/$', 'apps.main.views.delete_dev_conf', name='url_delete_dev_conf'),
+                 url(r'^dev_conf/(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_dev_conf'),
+                 url(r'^dev_conf/(?P<id_conf>-?\d+)/delete/$', 'apps.main.views.dev_conf_delete', name='url_delete_dev_conf'),
              )

apps/main/views.py +13 -128

                  return render(request, 'device.html', kwargs)
-             def add_device(request):
+             def device_new(request):
                  if request.method == 'GET':
                      form = DeviceForm()
                  return render(request, 'device_edit.html', kwargs)
-             def edit_device(request, id_dev):
+             def device_edit(request, id_dev):
                  device = Device.objects.get(pk=id_dev)
                  return render(request, 'device_edit.html', kwargs)
-             def delete_device(request, id_dev):
+             def device_delete(request, id_dev):
                  device = Device.objects.get(pk=id_dev)
                  return render(request, 'campaign.html', kwargs)
-             def add_campaign(request):
+             def campaign_new(request):
                  if request.method == 'GET':
                      form = CampaignForm()
                  return render(request, 'campaign_edit.html', kwargs)
-             def edit_campaign(request, id_camp):
+             def campaign_edit(request, id_camp):
                  campaign = Campaign.objects.get(pk=id_camp)
                  return render(request, 'campaign_edit.html', kwargs)
-             def delete_campaign(request, id_camp):
+             def campaign_delete(request, id_camp):
                  campaign = Campaign.objects.get(pk=id_camp)
                  return render(request, 'experiment.html', kwargs)
-             def add_experiment(request, id_camp=0):
+             def experiment_new(request, id_camp=0):
                  if request.method == 'GET':
                      form = ExperimentForm(initial={'campaign':id_camp})
                  return render(request, 'experiment_edit.html', kwargs)
-             def edit_experiment(request, id_exp):
+             def experiment_edit(request, id_exp):
                  experiment = Experiment.objects.get(pk=id_exp)
                  return render(request, 'experiment_edit.html', kwargs)
-             def delete_experiment(request, id_exp):
+             def experiment_delete(request, id_exp):
                  experiment = Experiment.objects.get(pk=id_exp)
                  return render(request, 'dev_conf.html', kwargs)
-             def add_dev_conf(request, id_exp=0):
+             def dev_conf_new(request, id_exp=0):
                  if request.method == 'GET':
                      form = ConfigurationForm(initial={'experiment':id_exp})
                  return render(request, 'dev_conf_edit.html', kwargs)
-             def edit_dev_conf(request, id_conf):
+             def dev_conf_edit(request, id_conf):
                  conf = Configuration.objects.get(pk=id_conf)
                  return render(request, 'dev_conf_edit.html', kwargs)
-             def delete_dev_conf(request, id_conf):
+             def dev_conf_delete(request, id_conf):
                  conf = Configuration.objects.get(pk=id_conf)
                  kwargs = {'object':conf, 'conf_active':'active',
                        'url_cancel':'url_dev_conf', 'id_item':id_conf}
-                 return render(request, 'item_delete.html', kwargs)
-             # def experiment(request, id_exp=0, id_dev_type=0):
-             #     kwargs = {}
-             #     if id_exp:
-             #         experiment = Experiment.objects.get(pk=id_exp)
-             #         devices = Configuration.objects.filter(configuration__experiment=experiment)
-             #         kwargs['experiment'] = experiment
-             #         kwargs['experiment_keys'] = ['campaign', 'name', 'start_time', 'end_time']
+             #
-             #         form = ExperimentForm(instance=experiment)
+             #
-             #         if id_dev_type:
-             #             subform = DeviceTypeForm(initial={'device_type':id_dev_type})
-             #             kwargs['keys'] = ['ip_address']
-             #             keys = ['id']+kwargs['keys']
-             #             kwargs['items'] = Device.objects.filter(device_type=id_dev_type).values(*keys)
-             #         else:
-             #             subform = DeviceTypeForm()
+             #
-             #         kwargs['form'] = form
-             #         kwargs['subform'] = subform
-             #         kwargs['device_keys'] = ['device_type__name', 'ip_address']
-             #         kwargs['devices'] = devices.values('device_type__name', 'ip_address', 'configuration__id')
-             #         kwargs['suptitle'] = 'Detail'
-             #     else:
-             #         experiments = Experiment.objects.all().order_by('start_time')
-             #         kwargs['keys'] = ['name', 'start_time', 'end_time']
-             #         keys = ['id']+kwargs['keys']
-             #         kwargs['items'] = experiments.values(*keys)
-             #         kwargs['suptitle'] = 'List'
-             #         kwargs['button'] = 'Add Experiment'
+             #
-             #     kwargs['id_dev_type'] = id_dev_type
-             #     kwargs['id_exp'] = id_exp
-             #     return render_to_response("experiment.html", kwargs, context_instance=RequestContext(request))
-             # def edit_experiment(request, id_exp):
-             #     if request.method=='POST':
-             #         experiment = Experiment.objects.get(pk=id_exp)
-             #         form = ExperimentForm(request.POST, instance=experiment)
-             #         if form.is_valid():
-             #             form.save()
-             #     return redirect('experiment', id_exp=id_exp)
-             # def experiment_add_device(request, id_exp):
-             #     if request.method=='POST':
-             #         experiment = Experiment.objects.get(pk=id_exp)
+             #
-             #         exp_devices = Device.objects.filter(configuration__experiment=experiment)
+             #
-             #         device = Device.objects.get(pk=request.POST['device'])
+             #
-             #         if device.id in exp_devices.values('id',):
-             #             return redirect('experiment', id_exp=id_exp)
+             #
-             #         model = MODELS[device.device_type.alias]
-             #         conf = model(experiment=experiment, device=device)
-             #         conf.save()
-             #     return redirect('experiment', id_exp=id_exp)
-             # def add_experiment(request):
+             #
-             #     kwargs = {}
-             #     if request.method == 'POST':
-             #         form = ExperimentForm(request.POST)
-             #         if form.is_valid():
-             #             experiment = form.save()
-             #             return redirect('experiment', id_exp=experiment.id)
-             #     else:
-             #         form = ExperimentForm()
-             #     kwargs['form_new'] = form
-             #     kwargs['title'] = 'Experiment'
-             #     kwargs['suptitle'] = 'New'
-             #     kwargs['id_exp'] = 0
-             #     return render_to_response("experiment.html", kwargs, context_instance=RequestContext(request))
-             # def device(request, id_dev=0):
-             #     kwargs = {}
-             #     if id_dev:
-             #         device = Device.objects.get(pk=id_dev)
-             #         kwargs['form'] = DeviceForm(instance=device)
-             #         kwargs['action'] = 'edit/'
-             #         kwargs['button'] = 'Update'
-             #         kwargs['suptitle'] = 'Detail'
-             #     else:
-             #         devices = Device.objects.all()
-             #         kwargs['keys'] = ['device_type__name', 'ip_address']
-             #         keys = ['id']+kwargs['keys']
-             #         kwargs['items'] = devices.values(*keys)
-             #         kwargs['suptitle'] = 'List'
-             #         kwargs['button'] = 'Add Device'
-             #     return render_to_response("device.html", kwargs, context_instance=RequestContext(request))
+             #
-             # def edit_device(request, id_dev):
-             #     if request.method=='POST':
-             #         device = Device.objects.get(pk=id_dev)
-             #         form = DeviceForm(request.POST, instance=device)
-             #         if form.is_valid():
-             #             form.save()
-             #     return redirect('devices')
+             #
-             # def add_device(request):
-             #     kwargs = {}
-             #     if request.method == 'POST':
-             #         form = DeviceForm(request.POST)
-             #         if form.is_valid():
-             #             form.save()
-             #             return redirect('devices')
-             #     else:
-             #         form = DeviceForm()
-             #     kwargs['form'] = form
-             #     kwargs['button'] = 'Create'
-             #     kwargs['suptitle'] = 'New'
-             #     return render_to_response("device.html", kwargs, context_instance=RequestContext(request))
+                 return render(request, 'item_delete.html', kwargs)
  No newline at end of file

apps/rc/urls.py +1 -1

              urlpatterns = (
                  url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_rc_conf'),
-                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_rc_conf'),
+                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_rc_conf'),
              )

apps/usrp/urls.py +1 -1

              urlpatterns = (
                  url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_usrp_conf'),
-                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_usrp_conf'),
+                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_usrp_conf'),
              )

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