radarsys_met Commit - r274:b4c0ecf56a8d

Task #1127: Get Log function has been implemented...

Fiorella Quino -

r274:b4c0ecf56a8d

parent child

Context file:

r274:b4c0ecf56a8d

Collapse all files

apps/jars/models.py +24 -2

             from apps.main.models import Configuration
             from apps.main.utils import Params
             # Create your models here.
             EXPERIMENT_TYPE = (
                 #view_raw_data    = models.BooleanField(verbose_name='View Raw Data', default=True)
                 save_ch_dc       = models.BooleanField(verbose_name='Save Channels DC', default=True)
                 save_data        = models.BooleanField(verbose_name='Save Data', default=True)
-                filter_parms     = models.CharField(max_length=10000, default='{"clock": 60, "mult": 5, "fch": 49.92, "fch_decimal":	721554506, "filter_fir": 2, "filter_2": 12, "filter_5": 25}, "model": "jars.jarsfilter", "pk": 1}')
+                filter_parms     = models.CharField(max_length=10000, default='{"clock": 60, "mult": 5, "fch": 49.92, "fch_decimal":	721554506, "filter_fir": 2, "filter_2": 12, "filter_5": 25}')
                 class Meta:
                     db_table = 'jars_configurations'
                     if filter_parms.__class__.__name__=='str':
                         filter_parms = eval(filter_parms)
-                    filter_clock = filter_parms['clock']
+                    filter_clock = float(filter_parms['clock'])
                     filter_2 = filter_parms['filter_2']
                     filter_5 = filter_parms['filter_5']
                     filter_fir = filter_parms['filter_fir']
                     return True
+                def get_log(self):
+                    payload = None
+                    try:
+                        payload = requests.get(self.device.url('get_log'), params={'name':self.experiment.name})
+                    except:
+                        self.device.status = 0
+                        self.device.save()
+                        self.message = 'Jars API is not running.'
+                        return False
+                    self.message = 'Jars API is running'
+                    return payload
                 def update_from_file(self, filename):
                     f = JARSFile(filename)
                 def get_absolute_url_read(self):
                     return reverse('url_read_jars_conf', args=[str(self.id)])
+                def get_absolute_url_log(self):
+                    return reverse('url_get_jars_log', args=[str(self.id)])

apps/jars/templates/jars_conf.html +3 0

             {% load bootstrap3 %}
             {% load main_tags %}
+            {% block extra-menu-actions %}
+            <li><a href="{{ dev_conf.get_absolute_url_log }}"><span class="glyphicon glyphicon-save-file" aria-hidden="true"></span> Get Log File</a></li>
+            {% endblock %}
             {% block extra-content %}

apps/jars/urls.py +1 0

                 url(r'^(?P<conf_id>-?\d+)/change_filter/(?P<filter_id>-?\d+)/$', views.change_filter, name='url_change_jars_filter'),
                 url(r'^(?P<conf_id>-?\d+)/import/$', views.import_file, name='url_import_jars_conf'),
                 url(r'^(?P<conf_id>-?\d+)/read/$', views.read_conf, name='url_read_jars_conf'),
+                url(r'^(?P<conf_id>-?\d+)/get_log/$', views.get_log, name='url_get_jars_log'),
             )

apps/jars/views.py +26 0

@@ -2,6 +2,7 from django.shortcuts import render_to_response
2	from django.template import RequestContext	2	from django.template import RequestContext
3	from django.shortcuts import redirect, render, get_object_or_404	3	from django.shortcuts import redirect, render, get_object_or_404
4	from django.contrib import messages	4	from django.contrib import messages
		5	from django.http import HttpResponse
5		6
6	from apps.main.models import Device	7	from apps.main.models import Device
7	from apps.main.views import sidebar	8	from apps.main.views import sidebar
@@ -207,3 +208,28 def change_filter(request, conf_id, filter_id=None):
207	kwargs['conf_id'] = conf.id	208	kwargs['conf_id'] = conf.id
208	kwargs['filter_id'] = filter_id	209	kwargs['filter_id'] = filter_id
209	return render(request, 'change_jars_filter.html', kwargs)	210	return render(request, 'change_jars_filter.html', kwargs)
		211
		212
		213	def get_log(request, conf_id):
		214
		215	conf = get_object_or_404(JARSConfiguration, pk=conf_id)
		216	response = conf.get_log()
		217
		218	if not response:
		219	message = conf.message
		220	messages.error(request, message)
		221	return redirect('url_jars_conf', id_conf=conf.id)
		222
		223	try:
		224	message = response.json()['message']
		225	messages.error(request, message)
		226	return redirect('url_jars_conf', id_conf=conf.id)
		227	except Exception as e:
		228	message = 'Restarting Report.txt has been downloaded successfully.'
		229
		230	content = response
		231	filename = 'Log_%s_%s.txt' %(conf.experiment.name, conf.experiment.id)
		232	response = HttpResponse(content,content_type='text/plain')
		233	response['Content-Disposition'] = 'attachment; filename="%s"' %filename
		234
		235	return response No newline at end of file

apps/main/views.py 0 -3

                                     line.params = json.dumps(line_params)
                                     line.save()
-                        if conf.device.device_type.name=='jars':
-                            conf.add_parms_to_filter()
                         return redirect('url_dev_conf', id_conf=conf.pk)
                 kwargs['id_exp'] = id_exp

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