##// END OF EJS Templates
- Ejecutando el script de cambio de apunte....
jsalyrosas -
r204:205
parent child
Show More
@@ -0,0 +1,131
1 # -*- coding: utf-8 -*-
2 import datetime
3 from south.db import db
4 from south.v2 import SchemaMigration
5 from django.db import models
6
7
8 class Migration(SchemaMigration):
9
10 def forwards(self, orm):
11 # Adding model 'Profile'
12 db.create_table('abs_profile_antenna', (
13 ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
14 ('name', self.gf('django.db.models.fields.CharField')(max_length=250)),
15 ('date_create', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
16 ('date_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
17 ('hits', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
18 ('state', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=0)),
19 ))
20 db.send_create_signal('abscontrol', ['Profile'])
21
22 # Adding model 'Pattern'
23 db.create_table('abs_pattern_antenna', (
24 ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
25 ('profile', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['abscontrol.Profile'])),
26 ('value', self.gf('django.db.models.fields.PositiveIntegerField')()),
27 ('date_create', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
28 ('date_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
29 ('hits', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
30 ('state', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=1)),
31 ))
32 db.send_create_signal('abscontrol', ['Pattern'])
33
34 # Adding model 'AntennaUp'
35 db.create_table('abs_antenna_up', (
36 ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
37 ('pattern', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['abscontrol.Pattern'])),
38 ('value', self.gf('django.db.models.fields.TextField')()),
39 ('tx', self.gf('django.db.models.fields.TextField')(null=True)),
40 ('rx', self.gf('django.db.models.fields.TextField')(null=True)),
41 ('ues', self.gf('django.db.models.fields.CharField')(max_length=120, null=True)),
42 ('only_rx', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=0)),
43 ('date_create', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
44 ('date_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
45 ('hits', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
46 ('state', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=1)),
47 ))
48 db.send_create_signal('abscontrol', ['AntennaUp'])
49
50 # Adding model 'AntennaDown'
51 db.create_table('abs_antenna_down', (
52 ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
53 ('pattern', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['abscontrol.Pattern'])),
54 ('value', self.gf('django.db.models.fields.TextField')()),
55 ('tx', self.gf('django.db.models.fields.TextField')(null=True)),
56 ('rx', self.gf('django.db.models.fields.TextField')(null=True)),
57 ('ues', self.gf('django.db.models.fields.CharField')(max_length=120, null=True)),
58 ('only_rx', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=0)),
59 ('date_create', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
60 ('date_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
61 ('hits', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
62 ('state', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=1)),
63 ))
64 db.send_create_signal('abscontrol', ['AntennaDown'])
65
66
67 def backwards(self, orm):
68 # Deleting model 'Profile'
69 db.delete_table('abs_profile_antenna')
70
71 # Deleting model 'Pattern'
72 db.delete_table('abs_pattern_antenna')
73
74 # Deleting model 'AntennaUp'
75 db.delete_table('abs_antenna_up')
76
77 # Deleting model 'AntennaDown'
78 db.delete_table('abs_antenna_down')
79
80
81 models = {
82 'abscontrol.antennadown': {
83 'Meta': {'object_name': 'AntennaDown', 'db_table': "'abs_antenna_down'"},
84 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
85 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
86 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
87 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
88 'only_rx': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
89 'pattern': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Pattern']"}),
90 'rx': ('django.db.models.fields.TextField', [], {'null': 'True'}),
91 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
92 'tx': ('django.db.models.fields.TextField', [], {'null': 'True'}),
93 'ues': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True'}),
94 'value': ('django.db.models.fields.TextField', [], {})
95 },
96 'abscontrol.antennaup': {
97 'Meta': {'object_name': 'AntennaUp', 'db_table': "'abs_antenna_up'"},
98 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
99 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
100 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
101 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
102 'only_rx': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
103 'pattern': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Pattern']"}),
104 'rx': ('django.db.models.fields.TextField', [], {'null': 'True'}),
105 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
106 'tx': ('django.db.models.fields.TextField', [], {'null': 'True'}),
107 'ues': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True'}),
108 'value': ('django.db.models.fields.TextField', [], {})
109 },
110 'abscontrol.pattern': {
111 'Meta': {'object_name': 'Pattern', 'db_table': "'abs_pattern_antenna'"},
112 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
113 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
114 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
115 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
116 'profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Profile']"}),
117 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
118 'value': ('django.db.models.fields.PositiveIntegerField', [], {})
119 },
120 'abscontrol.profile': {
121 'Meta': {'object_name': 'Profile', 'db_table': "'abs_profile_antenna'"},
122 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
123 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
124 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
125 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
126 'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
127 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'})
128 }
129 }
130
131 complete_apps = ['abscontrol'] No newline at end of file
@@ -0,0 +1,73
1 # -*- coding: utf-8 -*-
2 import datetime
3 from south.db import db
4 from south.v2 import SchemaMigration
5 from django.db import models
6
7
8 class Migration(SchemaMigration):
9
10 def forwards(self, orm):
11 # Adding field 'Profile.is_active'
12 db.add_column('abs_profile_antenna', 'is_active',
13 self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=0),
14 keep_default=False)
15
16
17 def backwards(self, orm):
18 # Deleting field 'Profile.is_active'
19 db.delete_column('abs_profile_antenna', 'is_active')
20
21
22 models = {
23 'abscontrol.antennadown': {
24 'Meta': {'object_name': 'AntennaDown', 'db_table': "'abs_antenna_down'"},
25 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
26 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
27 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
28 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
29 'only_rx': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
30 'pattern': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Pattern']"}),
31 'rx': ('django.db.models.fields.TextField', [], {'null': 'True'}),
32 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
33 'tx': ('django.db.models.fields.TextField', [], {'null': 'True'}),
34 'ues': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True'}),
35 'value': ('django.db.models.fields.TextField', [], {})
36 },
37 'abscontrol.antennaup': {
38 'Meta': {'object_name': 'AntennaUp', 'db_table': "'abs_antenna_up'"},
39 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
40 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
41 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
42 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
43 'only_rx': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
44 'pattern': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Pattern']"}),
45 'rx': ('django.db.models.fields.TextField', [], {'null': 'True'}),
46 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
47 'tx': ('django.db.models.fields.TextField', [], {'null': 'True'}),
48 'ues': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True'}),
49 'value': ('django.db.models.fields.TextField', [], {})
50 },
51 'abscontrol.pattern': {
52 'Meta': {'object_name': 'Pattern', 'db_table': "'abs_pattern_antenna'"},
53 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
54 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
55 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
56 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
57 'profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Profile']"}),
58 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
59 'value': ('django.db.models.fields.PositiveIntegerField', [], {})
60 },
61 'abscontrol.profile': {
62 'Meta': {'object_name': 'Profile', 'db_table': "'abs_profile_antenna'"},
63 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
64 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
65 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
66 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
67 'is_active': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
68 'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
69 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'})
70 }
71 }
72
73 complete_apps = ['abscontrol'] No newline at end of file
@@ -0,0 +1,74
1 # -*- coding: utf-8 -*-
2 import datetime
3 from south.db import db
4 from south.v2 import SchemaMigration
5 from django.db import models
6
7
8 class Migration(SchemaMigration):
9
10 def forwards(self, orm):
11 # Adding field 'Pattern.is_active'
12 db.add_column('abs_pattern_antenna', 'is_active',
13 self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=0),
14 keep_default=False)
15
16
17 def backwards(self, orm):
18 # Deleting field 'Pattern.is_active'
19 db.delete_column('abs_pattern_antenna', 'is_active')
20
21
22 models = {
23 'abscontrol.antennadown': {
24 'Meta': {'object_name': 'AntennaDown', 'db_table': "'abs_antenna_down'"},
25 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
26 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
27 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
28 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
29 'only_rx': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
30 'pattern': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Pattern']"}),
31 'rx': ('django.db.models.fields.TextField', [], {'null': 'True'}),
32 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
33 'tx': ('django.db.models.fields.TextField', [], {'null': 'True'}),
34 'ues': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True'}),
35 'value': ('django.db.models.fields.TextField', [], {})
36 },
37 'abscontrol.antennaup': {
38 'Meta': {'object_name': 'AntennaUp', 'db_table': "'abs_antenna_up'"},
39 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
40 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
41 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
42 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
43 'only_rx': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
44 'pattern': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Pattern']"}),
45 'rx': ('django.db.models.fields.TextField', [], {'null': 'True'}),
46 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
47 'tx': ('django.db.models.fields.TextField', [], {'null': 'True'}),
48 'ues': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True'}),
49 'value': ('django.db.models.fields.TextField', [], {})
50 },
51 'abscontrol.pattern': {
52 'Meta': {'object_name': 'Pattern', 'db_table': "'abs_pattern_antenna'"},
53 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
54 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
55 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
56 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
57 'is_active': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
58 'profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['abscontrol.Profile']"}),
59 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
60 'value': ('django.db.models.fields.PositiveIntegerField', [], {})
61 },
62 'abscontrol.profile': {
63 'Meta': {'object_name': 'Profile', 'db_table': "'abs_profile_antenna'"},
64 'date_create': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
65 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
66 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
67 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
68 'is_active': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
69 'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
70 'state': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'})
71 }
72 }
73
74 complete_apps = ['abscontrol'] No newline at end of file
1 NO CONTENT: new file 10644
NO CONTENT: new file 10644
1 NO CONTENT: new file 10644
NO CONTENT: new file 10644
@@ -132,6 +132,7
132 # 'django.contrib.admindocs',
132 # 'django.contrib.admindocs',
133 'abscontrol',
133 'abscontrol',
134 'audit',
134 'audit',
135 'south',
135 )
136 )
136
137
137 # A sample logging configuration. The only tangible logging
138 # A sample logging configuration. The only tangible logging
@@ -7,6 +7,7
7 date_modified = models.DateTimeField(auto_now=True)
7 date_modified = models.DateTimeField(auto_now=True)
8 hits = models.PositiveIntegerField(default=0)
8 hits = models.PositiveIntegerField(default=0)
9 state = models.PositiveSmallIntegerField(default=0)
9 state = models.PositiveSmallIntegerField(default=0)
10 is_active = models.PositiveSmallIntegerField(default=0)
10
11
11 class Meta:
12 class Meta:
12 db_table = "abs_profile_antenna"
13 db_table = "abs_profile_antenna"
@@ -22,6 +23,7
22 date_modified = models.DateTimeField(auto_now=True)
23 date_modified = models.DateTimeField(auto_now=True)
23 hits = models.PositiveIntegerField(default=0)
24 hits = models.PositiveIntegerField(default=0)
24 state = models.PositiveSmallIntegerField(default=1)
25 state = models.PositiveSmallIntegerField(default=1)
26 is_active = models.PositiveSmallIntegerField(default=0)
25
27
26 class Meta:
28 class Meta:
27 db_table = "abs_pattern_antenna"
29 db_table = "abs_pattern_antenna"
@@ -24,4 +24,5
24 url(r'^(?P<profile_id>\d+)/(?P<pattern_id>\d+)/overjroDown/(?P<antenna_id>\d+)/$', 'overJRODown'),
24 url(r'^(?P<profile_id>\d+)/(?P<pattern_id>\d+)/overjroDown/(?P<antenna_id>\d+)/$', 'overJRODown'),
25 url(r'^export/(?P<profile_id>\d+)/$', 'export'),
25 url(r'^export/(?P<profile_id>\d+)/$', 'export'),
26 url(r'^send/(?P<profile_id>\d+)/$', 'send'),
26 url(r'^send/(?P<profile_id>\d+)/$', 'send'),
27 url(r'^change/(?P<profile_id>\d+)/(?P<pattern_id>\d+)/$', 'changePattern'),
27 ) No newline at end of file
28 )
@@ -16,6 +16,7
16 from util.ABSData import ABSData
16 from util.ABSData import ABSData
17 from util.OverJRO import OverJRO
17 from util.OverJRO import OverJRO
18 from scripts.sendFile import sendFile
18 from scripts.sendFile import sendFile
19 from scripts.changeBeam import changeBeam
19 from overJroShow import overJroShow
20 from overJroShow import overJroShow
20
21
21 arrayTx = [["0","0","0","0","0","0","0","0"],\
22 arrayTx = [["0","0","0","0","0","0","0","0"],\
@@ -403,7 +404,6
403 return render_to_response('abscontrol/overjro_up.html', {'img_up': filename,'antennaUp': objAntenna,},
404 return render_to_response('abscontrol/overjro_up.html', {'img_up': filename,'antennaUp': objAntenna,},
404 context_instance=RequestContext(request))
405 context_instance=RequestContext(request))
405
406
406
407 def overJRODown(request, profile_id, pattern_id, antenna_id):
407 def overJRODown(request, profile_id, pattern_id, antenna_id):
408 objAntenna = AntennaDown.objects.get(pk=antenna_id)
408 objAntenna = AntennaDown.objects.get(pk=antenna_id)
409 img_path = getImgfromOverJRO(profile_id, objAntenna)
409 img_path = getImgfromOverJRO(profile_id, objAntenna)
@@ -463,13 +463,57
463
463
464 if output == "OK":
464 if output == "OK":
465 message = "File sent successfully."
465 message = "File sent successfully."
466 lsProfilesActive = Profile.objects.filter(is_active=1)
467 if len(lsProfilesActive) > 0:
468 objProfileActive = Profile.objects.get(is_active=1)
469 objProfileActive.is_active = 0
470 objProfileActive.save()
471
466 objProfile.hits += 1
472 objProfile.hits += 1
473 objProfile.is_active = 1
467 objProfile.save()
474 objProfile.save()
475
476 pattern_value = 1
477 patternChoosen = objProfile.pattern_set.get(value=pattern_value)
478 patternChoosen.is_active = 1
479 patternChoosen.save()
480
481 newurl = '/abscontrol/view/%d' % int(profile_id)
482
483 return redirect(newurl)
468 else:
484 else:
469 message = "Error sending file."
485 message = "Error sending file."
470
486
471 profile_list = Profile.objects.all()
487 profile_list = Profile.objects.all()
472
488
473 return render_to_response('abscontrol/sendFile.html', {'message': message, "profile_list" : profile_list,
489 return render_to_response('abscontrol/sendFile.html', {'message': message, "profile_list" : profile_list,
474 'objProfile': objProfile,
490 'objProfile': objProfile,
475 }, context_instance=RequestContext(request))
491 }, context_instance=RequestContext(request))
492
493 def changePattern(request, profile_id, pattern_id):
494 patternChoosen = Pattern.objects.get(id=pattern_id)
495 beam = int(patternChoosen.value)-1
496
497 apiclient = changeBeam()
498 apiclient.execute(str(beam))
499 output = apiclient.getOutput()
500
501 if output == "OK":
502 lsPatternsActive = Pattern.objects.filter(is_active=1)
503 if len(lsPatternsActive) > 0:
504 objPatternActive = Pattern.objects.get(is_active=1)
505 objPatternActive.is_active = 0
506 objPatternActive.save()
507
508 patternChoosen.hits += 1
509 patternChoosen.is_active = 1
510 patternChoosen.save()
511
512 newurl = '/abscontrol/%d/view/%d/' % (int(profile_id), int(pattern_id))
513 return redirect(newurl)
514 else:
515 message = "Error sending file."
516 profile_list = Profile.objects.all()
517 return render_to_response('abscontrol/sendFile.html', {'message': message, "profile_list" : profile_list,
518 }, context_instance=RequestContext(request))
519 No newline at end of file
@@ -1,6 +1,9
1 Django==1.4.3
1 Django==1.4.3
2 MySQL-python==1.2.3
2 MySQL-python==1.2.4
3 South==0.8.1
3 argparse==1.2.1
4 argparse==1.2.1
5 matplotlib==1.2.1
4 numpy==1.7.1
6 numpy==1.7.1
7 scipy==0.12.0
5 wsgiref==0.1.2
8 wsgiref==0.1.2
6 yolk==0.4.3
9 yolk==0.4.3
@@ -452,7 +452,7
452
452
453 .overJRO img {
453 .overJRO img {
454 width: 400px;
454 width: 400px;
455 height: 250px;
455 height: 270px;
456 text-align: center;
456 text-align: center;
457 vertical-align: middle;
457 vertical-align: middle;
458 margin: 10px 5px 5px 5px;
458 margin: 10px 5px 5px 5px;
@@ -541,6 +541,10
541 background-color: #2cc !important;
541 background-color: #2cc !important;
542 color: #fff; }
542 color: #fff; }
543
543
544 .lnkPatternActive {
545 color: #f66;
546 }
547
544 .divListofPatterns {
548 .divListofPatterns {
545 width: 650px;
549 width: 650px;
546 display: block;
550 display: block;
@@ -19,8 +19,10
19 ///*
19 ///*
20 $.ajax({
20 $.ajax({
21 url: result_url,
21 url: result_url,
22 cache: false,
23 beforeSend: function(){
24 },
22 success: function(){
25 success: function(){
23 //alert('overjro!');
24 $('#PictureOverJRO'+field_Id).load(result_url);
26 $('#PictureOverJRO'+field_Id).load(result_url);
25 },
27 },
26 });
28 });
@@ -43,4 +45,10
43 $('#lnkChangeProfile').click(function(){
45 $('#lnkChangeProfile').click(function(){
44 $('#frmProfile').submit();
46 $('#frmProfile').submit();
45 });
47 });
48 $('.lnkChangePattern').click(function(){
49 profile_id = $("input[name=txtProfileId]").val();
50 pattern_id = $("input[name=txtPatternId]").val();
51
52 location.href="/abscontrol/change/"+profile_id+"/"+pattern_id+"/";
53 });
46 }); No newline at end of file
54 });
@@ -1,9 +1,5
1 <div class="overJRO" id="PictureOverJROUp">
1 <div class="overJRO" id="PictureOverJROUp">
2 {% if img_up %}
2 {% if img_up %}<img src="/media/{{ img_up }}" />{% else %}<img />{% endif %}
3 <img src="/media/{{ img_up }}" />
4 {% else %}
5 <img />
6 {% endif %}
7 {% if antennaUp.value != None and antennaUp.tx != None and antennaUp.rx != None and antennaUp.ues != None %}
3 {% if antennaUp.value != None and antennaUp.tx != None and antennaUp.rx != None and antennaUp.ues != None %}
8 <a href="#" class="activeOverJRO" id="Up">Preview</a>
4 <a href="#" class="activeOverJRO" id="Up">Preview</a>
9 {% else %}
5 {% else %}
@@ -30,11 +30,21
30 <nav class="" id="navPatternList">
30 <nav class="" id="navPatternList">
31 <ul>
31 <ul>
32 {% for element in lsPatterns %}
32 {% for element in lsPatterns %}
33 <li>
33 {% if patternChoosen.id == element.id %}
34 {% if patternChoosen.id == element.id %}
34 <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}/" class="lnkPatternSelected">{{ element.value }}</a></li>
35 {% if element.is_active == 1 %}
36 <a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}/" class="lnkPatternSelected lnkPatternActive">{{ element.value }}</a>
37 {% else %}
38 <a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}/" class="lnkPatternSelected">{{ element.value }}</a>
39 {% endif %}
35 {% else %}
40 {% else %}
36 <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}/" class="lnkPattern">{{ element.value }}</a></li>
41 {% if element.is_active == 1 %}
42 <a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}/" class="lnkPattern lnkPatternActive">{{ element.value }}</a>
43 {% else %}
44 <a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}/" class="lnkPattern">{{ element.value }}</a>
45 {% endif %}
37 {% endif %}
46 {% endif %}
47 </li>
38 {% endfor %}
48 {% endfor %}
39 </ul>
49 </ul>
40 <div class="cleardivs"></div>
50 <div class="cleardivs"></div>
@@ -42,14 +52,16
42 </div>
52 </div>
43 {% endif %}
53 {% endif %}
44 {% block mnuPattern %}
54 {% block mnuPattern %}
55 {% if objProfile.is_active == 1 %}
45 <div class="divMenu" id="divMnuPattern">
56 <div class="divMenu" id="divMnuPattern">
46 <nav class="MnuHorizontal">
57 <nav class="MnuHorizontal">
47 <ul class="mnu" id="mnuPattern">
58 <ul class="mnu" id="mnuPattern">
48 <li><a href="#">Apply</a></li>
59 <li><a href="#" class="lnkChangePattern">Apply</a></li>
49 </ul>
60 </ul>
50 </nav>
61 </nav>
51 </div>
62 </div>
52 <div class="cleardivs"></div>
63 <div class="cleardivs"></div>
64 {% endif %}
53 {% endblock %}
65 {% endblock %}
54 <div id="divPattern">
66 <div id="divPattern">
55 <div id="infoPattern">
67 <div id="infoPattern">
General Comments 0
You need to be logged in to leave comments. Login now