# SVN changeset patch # User jsalyrosas # Date 2013-06-24 21:55:30.140794 # Revision 205 - Ejecutando el script de cambio de apunte. - Actualizado el archivo requirements.txt para instalar las librerias necesarias para el proyecto. - Instalado South para el manejo de actualizaciones de los modelos(actualizacion de tablas). Index: trunk/webapp/abs_webapp_dev/settings.py =================================================================== diff --git a/trunk/webapp/abs_webapp_dev/settings.py b/trunk/webapp/abs_webapp_dev/settings.py --- a/trunk/webapp/abs_webapp_dev/settings.py (revision 204) +++ b/trunk/webapp/abs_webapp_dev/settings.py (revision 205) @@ -132,6 +132,7 @@ # 'django.contrib.admindocs', 'abscontrol', 'audit', + 'south', ) # A sample logging configuration. The only tangible logging Index: trunk/webapp/abscontrol/migrations/0001_initial.py =================================================================== diff --git a/trunk/webapp/abscontrol/migrations/0001_initial.py b/trunk/webapp/abscontrol/migrations/0001_initial.py new file mode 10644 --- /dev/null (revision 0) +++ b/trunk/webapp/abscontrol/migrations/0001_initial.py (revision 205) @@ -0,0 +1,131 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'Profile' + db.create_table('abs_profile_antenna', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('name', self.gf('django.db.models.fields.CharField')(max_length=250)), + ('date_create', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + ('date_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)), + ('hits', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)), + ('state', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=0)), + )) + db.send_create_signal('abscontrol', ['Profile']) + + # Adding model 'Pattern' + db.create_table('abs_pattern_antenna', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('profile', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['abscontrol.Profile'])), + ('value', self.gf('django.db.models.fields.PositiveIntegerField')()), + ('date_create', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + ('date_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)), + ('hits', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)), + ('state', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=1)), + )) + db.send_create_signal('abscontrol', ['Pattern']) + + # Adding model 'AntennaUp' + db.create_table('abs_antenna_up', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('pattern', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['abscontrol.Pattern'])), + ('value', self.gf('django.db.models.fields.TextField')()), + ('tx', self.gf('django.db.models.fields.TextField')(null=True)), + ('rx', self.gf('django.db.models.fields.TextField')(null=True)), + ('ues', self.gf('django.db.models.fields.CharField')(max_length=120, null=True)), + ('only_rx', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=0)), + ('date_create', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + ('date_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)), + ('hits', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)), + ('state', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=1)), + )) + db.send_create_signal('abscontrol', ['AntennaUp']) + + # Adding model 'AntennaDown' + db.create_table('abs_antenna_down', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('pattern', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['abscontrol.Pattern'])), + ('value', self.gf('django.db.models.fields.TextField')()), + ('tx', self.gf('django.db.models.fields.TextField')(null=True)), + ('rx', self.gf('django.db.models.fields.TextField')(null=True)), + ('ues', self.gf('django.db.models.fields.CharField')(max_length=120, null=True)), + ('only_rx', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=0)), + ('date_create', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + ('date_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)), + ('hits', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)), + ('state', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=1)), + )) + db.send_create_signal('abscontrol', ['AntennaDown']) + + + def backwards(self, orm): + # Deleting model 'Profile' + db.delete_table('abs_profile_antenna') + + # Deleting model 'Pattern' + db.delete_table('abs_pattern_antenna') + + # Deleting model 'AntennaUp' + db.delete_table('abs_antenna_up') + + # Deleting model 'AntennaDown' + db.delete_table('abs_antenna_down') + + + models = { + 'abscontrol.antennadown': { + 'Meta': {'object_name': 'AntennaDown', 'db_table': "'abs_antenna_down'"}, + 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'only_rx': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'pattern': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Pattern']"}), + 'rx': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'tx': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'ues': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True'}), + 'value': ('django.db.models.fields.TextField', [], {}) + }, + 'abscontrol.antennaup': { + 'Meta': {'object_name': 'AntennaUp', 'db_table': "'abs_antenna_up'"}, + 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'only_rx': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'pattern': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Pattern']"}), + 'rx': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'tx': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'ues': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True'}), + 'value': ('django.db.models.fields.TextField', [], {}) + }, + 'abscontrol.pattern': { + 'Meta': {'object_name': 'Pattern', 'db_table': "'abs_pattern_antenna'"}, + 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Profile']"}), + 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'value': ('django.db.models.fields.PositiveIntegerField', [], {}) + }, + 'abscontrol.profile': { + 'Meta': {'object_name': 'Profile', 'db_table': "'abs_profile_antenna'"}, + 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}), + 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}) + } + } + + complete_apps = ['abscontrol'] \ No newline at end of file Index: trunk/webapp/abscontrol/migrations/0002_auto__add_field_profile_is_active.py =================================================================== diff --git a/trunk/webapp/abscontrol/migrations/0002_auto__add_field_profile_is_active.py b/trunk/webapp/abscontrol/migrations/0002_auto__add_field_profile_is_active.py new file mode 10644 --- /dev/null (revision 0) +++ b/trunk/webapp/abscontrol/migrations/0002_auto__add_field_profile_is_active.py (revision 205) @@ -0,0 +1,73 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Profile.is_active' + db.add_column('abs_profile_antenna', 'is_active', + self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=0), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Profile.is_active' + db.delete_column('abs_profile_antenna', 'is_active') + + + models = { + 'abscontrol.antennadown': { + 'Meta': {'object_name': 'AntennaDown', 'db_table': "'abs_antenna_down'"}, + 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'only_rx': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'pattern': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Pattern']"}), + 'rx': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'tx': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'ues': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True'}), + 'value': ('django.db.models.fields.TextField', [], {}) + }, + 'abscontrol.antennaup': { + 'Meta': {'object_name': 'AntennaUp', 'db_table': "'abs_antenna_up'"}, + 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'only_rx': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'pattern': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Pattern']"}), + 'rx': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'tx': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'ues': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True'}), + 'value': ('django.db.models.fields.TextField', [], {}) + }, + 'abscontrol.pattern': { + 'Meta': {'object_name': 'Pattern', 'db_table': "'abs_pattern_antenna'"}, + 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Profile']"}), + 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'value': ('django.db.models.fields.PositiveIntegerField', [], {}) + }, + 'abscontrol.profile': { + 'Meta': {'object_name': 'Profile', 'db_table': "'abs_profile_antenna'"}, + 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}), + 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}) + } + } + + complete_apps = ['abscontrol'] \ No newline at end of file Index: trunk/webapp/abscontrol/migrations/0003_auto__add_field_pattern_is_active.py =================================================================== diff --git a/trunk/webapp/abscontrol/migrations/0003_auto__add_field_pattern_is_active.py b/trunk/webapp/abscontrol/migrations/0003_auto__add_field_pattern_is_active.py new file mode 10644 --- /dev/null (revision 0) +++ b/trunk/webapp/abscontrol/migrations/0003_auto__add_field_pattern_is_active.py (revision 205) @@ -0,0 +1,74 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Pattern.is_active' + db.add_column('abs_pattern_antenna', 'is_active', + self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=0), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Pattern.is_active' + db.delete_column('abs_pattern_antenna', 'is_active') + + + models = { + 'abscontrol.antennadown': { + 'Meta': {'object_name': 'AntennaDown', 'db_table': "'abs_antenna_down'"}, + 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'only_rx': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'pattern': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Pattern']"}), + 'rx': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'tx': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'ues': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True'}), + 'value': ('django.db.models.fields.TextField', [], {}) + }, + 'abscontrol.antennaup': { + 'Meta': {'object_name': 'AntennaUp', 'db_table': "'abs_antenna_up'"}, + 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'only_rx': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'pattern': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Pattern']"}), + 'rx': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'tx': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'ues': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True'}), + 'value': ('django.db.models.fields.TextField', [], {}) + }, + 'abscontrol.pattern': { + 'Meta': {'object_name': 'Pattern', 'db_table': "'abs_pattern_antenna'"}, + 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Profile']"}), + 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'value': ('django.db.models.fields.PositiveIntegerField', [], {}) + }, + 'abscontrol.profile': { + 'Meta': {'object_name': 'Profile', 'db_table': "'abs_profile_antenna'"}, + 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}), + 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}) + } + } + + complete_apps = ['abscontrol'] \ No newline at end of file Index: trunk/webapp/abscontrol/migrations/__init__.py =================================================================== diff --git a/trunk/webapp/abscontrol/migrations/__init__.py b/trunk/webapp/abscontrol/migrations/__init__.py new file mode 10644 --- /dev/null (revision 0) +++ b/trunk/webapp/abscontrol/migrations/__init__.py (revision 205) Index: trunk/webapp/abscontrol/models.py =================================================================== diff --git a/trunk/webapp/abscontrol/models.py b/trunk/webapp/abscontrol/models.py --- a/trunk/webapp/abscontrol/models.py (revision 204) +++ b/trunk/webapp/abscontrol/models.py (revision 205) @@ -7,6 +7,7 @@ date_modified = models.DateTimeField(auto_now=True) hits = models.PositiveIntegerField(default=0) state = models.PositiveSmallIntegerField(default=0) + is_active = models.PositiveSmallIntegerField(default=0) class Meta: db_table = "abs_profile_antenna" @@ -22,6 +23,7 @@ date_modified = models.DateTimeField(auto_now=True) hits = models.PositiveIntegerField(default=0) state = models.PositiveSmallIntegerField(default=1) + is_active = models.PositiveSmallIntegerField(default=0) class Meta: db_table = "abs_pattern_antenna" Index: trunk/webapp/abscontrol/urls.py =================================================================== diff --git a/trunk/webapp/abscontrol/urls.py b/trunk/webapp/abscontrol/urls.py --- a/trunk/webapp/abscontrol/urls.py (revision 204) +++ b/trunk/webapp/abscontrol/urls.py (revision 205) @@ -24,4 +24,5 @@ url(r'^(?P\d+)/(?P\d+)/overjroDown/(?P\d+)/$', 'overJRODown'), url(r'^export/(?P\d+)/$', 'export'), url(r'^send/(?P\d+)/$', 'send'), + url(r'^change/(?P\d+)/(?P\d+)/$', 'changePattern'), ) \ No newline at end of file Index: trunk/webapp/abscontrol/views.py =================================================================== diff --git a/trunk/webapp/abscontrol/views.py b/trunk/webapp/abscontrol/views.py --- a/trunk/webapp/abscontrol/views.py (revision 204) +++ b/trunk/webapp/abscontrol/views.py (revision 205) @@ -16,6 +16,7 @@ from util.ABSData import ABSData from util.OverJRO import OverJRO from scripts.sendFile import sendFile +from scripts.changeBeam import changeBeam from overJroShow import overJroShow arrayTx = [["0","0","0","0","0","0","0","0"],\ @@ -403,7 +404,6 @@ return render_to_response('abscontrol/overjro_up.html', {'img_up': filename,'antennaUp': objAntenna,}, context_instance=RequestContext(request)) - def overJRODown(request, profile_id, pattern_id, antenna_id): objAntenna = AntennaDown.objects.get(pk=antenna_id) img_path = getImgfromOverJRO(profile_id, objAntenna) @@ -463,13 +463,57 @@ if output == "OK": message = "File sent successfully." + lsProfilesActive = Profile.objects.filter(is_active=1) + if len(lsProfilesActive) > 0: + objProfileActive = Profile.objects.get(is_active=1) + objProfileActive.is_active = 0 + objProfileActive.save() + objProfile.hits += 1 + objProfile.is_active = 1 objProfile.save() + + pattern_value = 1 + patternChoosen = objProfile.pattern_set.get(value=pattern_value) + patternChoosen.is_active = 1 + patternChoosen.save() + + newurl = '/abscontrol/view/%d' % int(profile_id) + + return redirect(newurl) else: message = "Error sending file." - profile_list = Profile.objects.all() - - return render_to_response('abscontrol/sendFile.html', {'message': message, "profile_list" : profile_list, - 'objProfile': objProfile, - }, context_instance=RequestContext(request)) + profile_list = Profile.objects.all() + + return render_to_response('abscontrol/sendFile.html', {'message': message, "profile_list" : profile_list, + 'objProfile': objProfile, + }, context_instance=RequestContext(request)) + +def changePattern(request, profile_id, pattern_id): + patternChoosen = Pattern.objects.get(id=pattern_id) + beam = int(patternChoosen.value)-1 + + apiclient = changeBeam() + apiclient.execute(str(beam)) + output = apiclient.getOutput() + + if output == "OK": + lsPatternsActive = Pattern.objects.filter(is_active=1) + if len(lsPatternsActive) > 0: + objPatternActive = Pattern.objects.get(is_active=1) + objPatternActive.is_active = 0 + objPatternActive.save() + + patternChoosen.hits += 1 + patternChoosen.is_active = 1 + patternChoosen.save() + + newurl = '/abscontrol/%d/view/%d/' % (int(profile_id), int(pattern_id)) + return redirect(newurl) + else: + message = "Error sending file." + profile_list = Profile.objects.all() + return render_to_response('abscontrol/sendFile.html', {'message': message, "profile_list" : profile_list, + }, context_instance=RequestContext(request)) + \ No newline at end of file =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/webapp/media/loading.gif =================================================================== diff --git a/trunk/webapp/media/loading.gif b/trunk/webapp/media/loading.gif new file mode 10644 --- /dev/null (revision 0) +++ b/trunk/webapp/media/loading.gif (revision 205) Index: trunk/webapp/requirements.txt =================================================================== diff --git a/trunk/webapp/requirements.txt b/trunk/webapp/requirements.txt --- a/trunk/webapp/requirements.txt (revision 204) +++ b/trunk/webapp/requirements.txt (revision 205) @@ -1,6 +1,9 @@ Django==1.4.3 -MySQL-python==1.2.3 +MySQL-python==1.2.4 +South==0.8.1 argparse==1.2.1 +matplotlib==1.2.1 numpy==1.7.1 +scipy==0.12.0 wsgiref==0.1.2 yolk==0.4.3 Index: trunk/webapp/static/css/style.css =================================================================== diff --git a/trunk/webapp/static/css/style.css b/trunk/webapp/static/css/style.css --- a/trunk/webapp/static/css/style.css (revision 204) +++ b/trunk/webapp/static/css/style.css (revision 205) @@ -452,7 +452,7 @@ .overJRO img { width: 400px; - height: 250px; + height: 270px; text-align: center; vertical-align: middle; margin: 10px 5px 5px 5px; @@ -541,6 +541,10 @@ background-color: #2cc !important; color: #fff; } +.lnkPatternActive { + color: #f66; +} + .divListofPatterns { width: 650px; display: block; Index: trunk/webapp/static/js/profiles.js =================================================================== diff --git a/trunk/webapp/static/js/profiles.js b/trunk/webapp/static/js/profiles.js --- a/trunk/webapp/static/js/profiles.js (revision 204) +++ b/trunk/webapp/static/js/profiles.js (revision 205) @@ -19,8 +19,10 @@ ///* $.ajax({ url: result_url, + cache: false, + beforeSend: function(){ + }, success: function(){ - //alert('overjro!'); $('#PictureOverJRO'+field_Id).load(result_url); }, }); @@ -43,4 +45,10 @@ $('#lnkChangeProfile').click(function(){ $('#frmProfile').submit(); }); + $('.lnkChangePattern').click(function(){ + profile_id = $("input[name=txtProfileId]").val(); + pattern_id = $("input[name=txtPatternId]").val(); + + location.href="/abscontrol/change/"+profile_id+"/"+pattern_id+"/"; + }); }); \ No newline at end of file Index: trunk/webapp/templates/abscontrol/overjro_up.html =================================================================== diff --git a/trunk/webapp/templates/abscontrol/overjro_up.html b/trunk/webapp/templates/abscontrol/overjro_up.html --- a/trunk/webapp/templates/abscontrol/overjro_up.html (revision 204) +++ b/trunk/webapp/templates/abscontrol/overjro_up.html (revision 205) @@ -1,9 +1,5 @@
- {% if img_up %} - - {% else %} - - {% endif %} + {% if img_up %}{% else %}{% endif %} {% if antennaUp.value != None and antennaUp.tx != None and antennaUp.rx != None and antennaUp.ues != None %} Preview {% else %} Index: trunk/webapp/templates/abscontrol/view.html =================================================================== diff --git a/trunk/webapp/templates/abscontrol/view.html b/trunk/webapp/templates/abscontrol/view.html --- a/trunk/webapp/templates/abscontrol/view.html (revision 204) +++ b/trunk/webapp/templates/abscontrol/view.html (revision 205) @@ -30,11 +30,21 @@
{% endif %} {% block mnuPattern %} + {% if objProfile.is_active == 1 %}
+ {% endif %} {% endblock %}