##// END OF EJS Templates
radarsys
RSS
adding django-json-field to requirement.txt...
Cristiam Castillo -
r5:c8ed4c7085e7
parent child
Show More
Show file before | Show file after | Hide comments
@@ -11,13 +11,11 class CGSConfiguration(models.Model):
11
11
12 device = models.ForeignKey(Device)
12 device = models.ForeignKey(Device)
13 exp = models.ForeignKey(Experiment, default = None)
13 exp = models.ForeignKey(Experiment, default = None)
14 freq0 = models.FloatField(verbose_name='Frequency 0',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)])
14 freq0 = models.FloatField(verbose_name='Frequency 0',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)])
15 freq1 = models.FloatField(verbose_name='Frequency 1',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)])
15 freq1 = models.FloatField(verbose_name='Frequency 1',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)])
16 freq2 = models.FloatField(verbose_name='Frequency 2',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)])
16 freq2 = models.FloatField(verbose_name='Frequency 2',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)])
17 freq3 = models.PositiveIntegerField(verbose_name='Frequency 3',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)])
17 freq3 = models.PositiveIntegerField(verbose_name='Frequency 3',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)])
18 freqs = JSONField(default={"frequencies":[{"f0":freq0,"f1":freq1,"f2":freq2,"f3":freq3}]}, blank=True)
18 freqs = JSONField(default={"frequencies":[{"f0":freq0,"f1":freq1,"f2":freq2,"f3":freq3}]}, blank=True)
19 #clk_in = models.PositiveIntegerField(default=10e6)
19 #clk_in = models.PositiveIntegerField(default=10e6)
20 #mult = models.PositiveIntegerField(default=40)
20 #mult = models.PositiveIntegerField(default=40)
21 #div = models.PositiveIntegerField(default=1)
21 #div = models.PositiveIntegerField(default=1)
22
23
Show file before | Show file after | Hide comments
@@ -44,6 +44,7 INSTALLED_APPS = (
44 'apps.cgs',
44 'apps.cgs',
45 'apps.acq',
45 'apps.acq',
46 'apps.abs',
46 'apps.abs',
47 'json_field'
47 )
48 )
48
49
49 MIDDLEWARE_CLASSES = (
50 MIDDLEWARE_CLASSES = (
@@ -112,10 +113,10 STATIC_ROOT = '/var/www/html/static/'
112
113
113 STATICFILES_DIRS = (
114 STATICFILES_DIRS = (
114 os.path.join(BASE_DIR, 'apps', 'main', 'static'),
115 os.path.join(BASE_DIR, 'apps', 'main', 'static'),
115
116
116 )
117 )
117
118
118 STATICFILES_FINDERS = (
119 STATICFILES_FINDERS = (
119 'django.contrib.staticfiles.finders.FileSystemFinder',
120 'django.contrib.staticfiles.finders.FileSystemFinder',
120 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
121 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
121 )
122 )
Show file before | Show file after | Hide comments
@@ -1,3 +1,4
1 Django==1.8.6
1 Django==1.8.6
2 django-bootstrap3==6.2.2
2 django-bootstrap3==6.2.2
3 MySQL-python==1.2.5
3 MySQL-python==1.2.5
4 django-json-field==0.5.7
General Comments 0
You need to be logged in to leave comments. Login now