Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git

Conflicts: .project .pydevproject

Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git
Conflicts: .project .pydevproject
Etienne Pallier
2 parents 1ff79f8d 509509a8
Showing 13 changed files with 733 additions and 11 deletions Show diff stats
.project
.pydevproject
.pydevproject.bak
classes_No_Name.dot
src/classes_No_Name.dot
src/classes_No_Name.png
src/packages_No_Name.dot
src/packages_No_Name.png
src/pyros/__init__.pyc
src/pyros/settings.pyc
src/pyrosapp/__init__.pyc
src/pyrosapp/admin.py
src/pyrosapp/models.py
@@ -12,7 +12,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.python.pydev.django.djangoNature</nature>
 		<nature>org.python.pydev.pythonNature</nature>
+		<nature>org.python.pydev.django.djangoNature</nature>
 	</natures>
 </projectDescription>
@@ -2,13 +2,4 @@
 <?eclipse-pydev version="1.0"?><pydev_project>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">venv_py35_pyros</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.0</pydev_property>
-<pydev_variables_property name="org.python.pydev.PROJECT_VARIABLE_SUBSTITUTION">
-<key>DJANGO_MANAGE_LOCATION</key>
-<value>src/manage.py</value>
-<key>DJANGO_SETTINGS_MODULE</key>
-<value>pyros.settings</value>
-</pydev_variables_property>
-<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/${PROJECT_DIR_NAME}/src</path>
-</pydev_pathproperty>
 </pydev_project>
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">venv_py35_pyros</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.0</pydev_property>
+<<<<<<< HEAD
+<pydev_variables_property name="org.python.pydev.PROJECT_VARIABLE_SUBSTITUTION">
+<key>DJANGO_MANAGE_LOCATION</key>
+<value>src/manage.py</value>
+<key>DJANGO_SETTINGS_MODULE</key>
+<value>pyros.settings</value>
+</pydev_variables_property>
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/${PROJECT_DIR_NAME}/src</path>
+</pydev_pathproperty>
+=======
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/${PROJECT_DIR_NAME}/src</path>
+</pydev_pathproperty>
+<pydev_variables_property name="org.python.pydev.PROJECT_VARIABLE_SUBSTITUTION">
+<key>DJANGO_MANAGE_LOCATION</key>
+<value>src/manage.py</value>
+<key>DJANGO_SETTINGS_MODULE</key>
+<value>pyros.settings</value>
+</pydev_variables_property>
+>>>>>>> branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git
+</pydev_project>
@@ -0,0 +1,4 @@
+digraph "classes_No_Name" {
+charset="utf-8"
+rankdir=BT
+}
@@ -0,0 +1,55 @@
+digraph "classes_No_Name" {
+charset="utf-8"
+rankdir=BT
+"0" [label="{Album|created : DateTimeField\ldesc : TextField\ldetector : ForeignKey\lname : CharField\lsequence : ForeignKey\lupdated : DateTimeField\l|}", shape="record"];
+"1" [label="{Alert|burst_dec : CharField\lburst_jd : CharField\lburst_ra : CharField\lclient : CharField\ldef_not_grb : IntegerField\leditor : CharField\lequinox : CharField\lflag : CharField\lgrb_error : CharField\lidgcn_notice : IntegerField\ljd_pkt : IntegerField\ljd_received : IntegerField\ljd_send : IntegerField\lrequest : ForeignKey\lstrategyobs : ForeignKey\ltrigger_instrum : CharField\ltrigger_num : CharField\ltype : CharField\lvoevent_xml : TextField\l|}", shape="record"];
+"2" [label="{Country|desc : TextField\lname : CharField\lquota : FloatField\l|}", shape="record"];
+"3" [label="{Detector|acq_start : DateTimeField\lacq_stop : DateTimeField\lcheck_temp : FloatField\ldevice : ForeignKey\lequivalent_foc_len : CharField\lgain : FloatField\lhas_shutter : IntegerField\lidcam_readout_mode : IntegerField\lnb_photo_x : IntegerField\lnb_photo_y : IntegerField\lphoto_size_x : IntegerField\lphoto_size_y : IntegerField\lreadout_noise : FloatField\lreadout_time : FloatField\lstatus : CharField\ltelescope : ForeignKey\l|}", shape="record"];
+"4" [label="{Device|created : DateTimeField\ldesc : TextField\lis_online : IntegerField\lmaintenance_date : DateTimeField\lname : CharField\lstatus : CharField\lupdated : DateTimeField\l|}", shape="record"];
+"5" [label="{Filter|category : CharField\ldetector : ForeignKey\ldevice : ForeignKey\ltransmission_curve_doc : CharField\l|}", shape="record"];
+"6" [label="{Image|created : DateTimeField\ldate_from_gps : CharField\ldesc : TextField\ldwn : CharField\ldwncata : CharField\ldwnimg : CharField\lexposure : CharField\lflaggps : CharField\lhumidext : CharField\llevel : IntegerField\llevel0_fits_name : CharField\llevel1a_fits_name : CharField\llevel1b_fits_name : CharField\lname : CharField\lnrtanalysis : ForeignKey\lplan : ForeignKey\lpressure : CharField\lquality : CharField\ltempext : CharField\ltype : CharField\lupdated : DateTimeField\lwind : CharField\lwind_dir : CharField\l|}", shape="record"];
+"7" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"8" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"9" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"10" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"11" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"12" [label="{Meta|db_table : str\lmanaged : bool\lunique_together : tuple\l|}", shape="record"];
+"13" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"14" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"15" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"16" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"17" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"18" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"19" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"20" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"21" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"22" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"23" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"24" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"25" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"26" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"27" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"28" [label="{Meta|db_table : str\lmanaged : bool\lunique_together : tuple\l|}", shape="record"];
+"29" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"30" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"31" [label="{Meta|db_table : str\lmanaged : bool\l|}", shape="record"];
+"32" [label="{Nrtanalysis|analysis : TextField\lcreated : DateTimeField\ldesc : TextField\lname : CharField\lupdated : DateTimeField\l|}", shape="record"];
+"33" [label="{Plan|album : ForeignKey\lcreated : DateTimeField\ldesc : CharField\ldithering : IntegerField\lduration : FloatField\lexposure_time : FloatField\lfilter : ForeignKey\lname : CharField\lnb_images : IntegerField\lposition : CharField\lupdated : DateTimeField\l|}", shape="record"];
+"34" [label="{PyrosappConfig|name : str\l|}", shape="record"];
+"35" [label="{Request|autodeposit : IntegerField\lcheckpoint : CharField\lcreated : DateTimeField\ldesc : TextField\lflag : CharField\lis_alert : IntegerField\lname : CharField\lpriority : IntegerField\lscientificprogram : ForeignKey\lstatus : CharField\ltarget_or_theme : CharField\ltype : CharField\lupdated : DateTimeField\luser : ForeignKey\l|}", shape="record"];
+"36" [label="{Schedule|created : DateTimeField\lday_start : DateTimeField\lday_stop : DateTimeField\lflag : CharField\l|}", shape="record"];
+"37" [label="{ScheduleHasSequences|schedulehistory : ForeignKey\lsequence : ForeignKey\l|}", shape="record"];
+"38" [label="{Schedulehistory|created : DateTimeField\lday_start : DateTimeField\lday_stop : DateTimeField\lflag : CharField\l|}", shape="record"];
+"39" [label="{Scientificprogram|desc : TextField\lname : CharField\lpriority : IntegerField\lquota : FloatField\l|}", shape="record"];
+"40" [label="{Sequence|alt_min : IntegerField\lanalysis_method : CharField\lcreated : DateTimeField\ldesc : TextField\lduration : FloatField\lexec_start : DateTimeField\lexec_stop : DateTimeField\lflag : CharField\limg_current : CharField\limg_total : CharField\lis_alert : IntegerField\lmoon_min : IntegerField\lname : CharField\lnot_obs : IntegerField\lobsolete : IntegerField\lpointing : CharField\lpriority : IntegerField\lprocessing : IntegerField\lrequest : ForeignKey\lschedule : ForeignKey\lsequencetype : ForeignKey\lstatus : CharField\ltype : CharField\lupdated : DateTimeField\lwith_drift : IntegerField\l|}", shape="record"];
+"41" [label="{Sequencetype|desc : TextField\lname : CharField\lpriority : IntegerField\l|}", shape="record"];
+"42" [label="{Sitewatch|dome : CharField\ldoors : CharField\llights : CharField\ltemperature : FloatField\lupdated : DateTimeField\l|}", shape="record"];
+"43" [label="{Sitewatchhistory|id : IntegerField\l|}", shape="record"];
+"44" [label="{Strategyobs|desc : TextField\ljson_file : CharField\lname : CharField\l|}", shape="record"];
+"45" [label="{Telescope|address : CharField\laltitude : FloatField\ldevice : ForeignKey\ldiameter : FloatField\lhorizon_def : FloatField\lhorizon_type : CharField\llatitude : FloatField\llim_dec_max : FloatField\llim_dec_min : FloatField\llim_ha_rise : FloatField\llim_ha_set : FloatField\llongitude : FloatField\lmount_type : CharField\lmpc_code : CharField\lnight_elev_sun : FloatField\lreadout_time : IntegerField\lsens : CharField\lslew_dead : IntegerField\lslew_rate_max : FloatField\lslew_time : IntegerField\lstatus : CharField\l|}", shape="record"];
+"46" [label="{User|acqvalid_beg : CharField\lacqvalid_end : CharField\laddress : CharField\lcan_del_void_req : IntegerField\lcountry : ForeignKey\lcreated : DateTimeField\lcur_connect : DateTimeField\ldesc : TextField\ldir_level : IntegerField\lemail : CharField\lfirstname : CharField\llast_connect : DateTimeField\llogin : CharField\lname : CharField\lp_priority : IntegerField\lpass_field : CharField\lputvalid_beg : DateTimeField\lputvalid_end : DateTimeField\lquota : FloatField\lquota_rea : FloatField\ltel1 : CharField\ltel2 : CharField\lu_priority : IntegerField\lupdated : DateTimeField\lurl : CharField\luserlevel : ForeignKey\l|}", shape="record"];
+"47" [label="{UserHasScientificprograms|scientificprogram : ForeignKey\luser : ForeignKey\l|}", shape="record"];
+"48" [label="{Userlevel|desc : TextField\lname : CharField\lpriority : IntegerField\lquota : FloatField\l|}", shape="record"];
+"49" [label="{Weatherwatch|dwn : CharField\lhumid_ext : FloatField\lhumid_int : FloatField\lpressure : FloatField\lrain : FloatField\ltemp_ext : FloatField\ltemp_int : FloatField\lupdated : DateTimeField\lwind : FloatField\lwind_dir : CharField\l|}", shape="record"];
+"50" [label="{Weatherwatchhistory|datetime : DateTimeField\ldwn : CharField\lhumid_ext : CharField\lhumid_int : CharField\lpressure : CharField\lrain : CharField\ltemp_ext : CharField\ltemp_int : CharField\lwind : CharField\lwind_dir : CharField\l|}", shape="record"];
+}
@@ -0,0 +1,11 @@
+digraph "packages_No_Name" {
+charset="utf-8"
+rankdir=BT
+"0" [label="pyrosapp", shape="box"];
+"1" [label="pyrosapp.admin", shape="box"];
+"2" [label="pyrosapp.apps", shape="box"];
+"3" [label="pyrosapp.migrations", shape="box"];
+"4" [label="pyrosapp.models_ORIG", shape="box"];
+"5" [label="pyrosapp.tests", shape="box"];
+"6" [label="pyrosapp.views", shape="box"];
+}
+from django import forms
 from django.contrib import admin
+from pyrosapp.models import *
-# Register your models here.
+# Many To Many interface adapter
+
+class UserAndSPInline(admin.TabularInline):
+    model = ScientificProgram.users.through
+
+class SequenceAndSHInline(admin.TabularInline):
+    model = ScheduleHistory.sequences.through
+
+class ScheduleHistoryAdmin(admin.ModelAdmin):
+    inlines = [
+        SequenceAndSHInline,
+    ]
+    exclude = ('sequences',)
+
+
+# One To Many interface adapters
+
+class SequenceInline(admin.TabularInline):
+    model = Sequence
+    fields = ("name",)
+    show_change_link = True
+
+class RequestInline(admin.TabularInline):
+    model = Request
+    fields = ("name",)
+    show_change_link = True
+
+class AlbumInline(admin.TabularInline):
+    model = Album
+    fields = ("name",)
+    show_change_link = True
+
+class PlanInline(admin.TabularInline):
+    model = Plan
+    fields = ("name",)
+    show_change_link = True
+
+class ImageInline(admin.TabularInline):
+    model = Image
+    fields = ("name",)
+    show_change_link = True
+
+class DetectorInline(admin.TabularInline):
+    model = Detector
+    fields = ("name",)
+    show_change_link = True
+
+class UserInline(admin.TabularInline):
+    model = User
+    fields = ("name",)
+    show_change_link = True
+
+class FilterInline(admin.TabularInline):
+    model = Filter
+    fields = ("name",)
+    show_change_link = True
+
+class AlertInline(admin.TabularInline):
+    model = Alert
+    fields = ("request.name",)
+    show_change_link = True
+
+
+
+class RequestAdmin(admin.ModelAdmin):
+    inlines = [
+        SequenceInline,
+    ]
+
+class ScheduleAdmin(admin.ModelAdmin):
+    inlines = [
+        SequenceInline,
+    ]
+
+class SequenceAdmin(admin.ModelAdmin):
+    inlines = [
+        AlbumInline,
+        SequenceAndSHInline, # for M2M interface
+    ]
+
+class UserAdmin(admin.ModelAdmin):
+    inlines = [
+        RequestInline,
+        UserAndSPInline, # for M2M interface
+    ]
+
+class StrategyObsAdmin(admin.ModelAdmin):
+    inlines = [
+        AlertInline,
+    ]
+
+class ScientificProgramAdmin(admin.ModelAdmin):
+    inlines = [
+        RequestInline,
+        UserAndSPInline, # for M2M interface
+    ]
+    exclude = ('users',) # for M2M interface
+
+class CountryAdmin(admin.ModelAdmin):
+    inlines = [
+        UserInline,
+    ]
+
+class UserLevelAdmin(admin.ModelAdmin):
+    inlines = [
+        UserInline,
+    ]
+
+class FilterAdmin(admin.ModelAdmin):
+    inlines = [
+        PlanInline,
+    ]
+
+class NrtAnalysisAdmin(admin.ModelAdmin):
+    inlines = [
+        ImageInline,
+    ]
+
+class DetectorAdmin(admin.ModelAdmin):
+    inlines = [
+        FilterInline,
+        AlbumInline,
+    ]
+
+class TelescopeAdmin(admin.ModelAdmin):
+    inlines = [
+        DetectorInline,
+    ]
+
+class PlanAdmin(admin.ModelAdmin):
+    inlines = [
+        ImageInline,
+    ]
+
+class AlbumAdmin(admin.ModelAdmin):
+    inlines = [
+        PlanInline,
+    ]
+
+class SequenceTypeAdmin(admin.ModelAdmin):
+    inlines = [
+        SequenceInline,
+    ]
+
+
+# Link the models to the admin interface
+
+admin.site.register(Album, AlbumAdmin)
+admin.site.register(Alert)
+admin.site.register(Country, CountryAdmin)
+admin.site.register(Detector, DetectorAdmin)
+admin.site.register(Device)
+admin.site.register(Filter, FilterAdmin)
+admin.site.register(Image)
+admin.site.register(NrtAnalysis, NrtAnalysisAdmin)
+admin.site.register(Plan, PlanAdmin)
+admin.site.register(Request, RequestAdmin)
+admin.site.register(Schedule, ScheduleAdmin)
+admin.site.register(ScheduleHistory, ScheduleHistoryAdmin)
+admin.site.register(ScientificProgram, ScientificProgramAdmin)
+admin.site.register(Sequence, SequenceAdmin)
+admin.site.register(SequenceType, SequenceTypeAdmin)
+admin.site.register(SiteWatch)
+admin.site.register(SiteWatchHistory)
+admin.site.register(StrategyObs, StrategyObsAdmin)
+admin.site.register(Telescope, TelescopeAdmin)
+admin.site.register(User, UserAdmin)
+admin.site.register(UserLevel, UserLevelAdmin)
+admin.site.register(WeatherWatch)
+admin.site.register(WeatherWatchHistory)
@@ -0,0 +1,464 @@
+# This is an auto-generated Django model module.
+# You'll have to do the following manually to clean this up:
+#   * Rearrange models' order
+#   * Make sure each model has one field with primary_key=True
+#   * Make sure each ForeignKey has `on_delete` set to the desired behavior.
+#   * Remove `managed = False` lines if you wish to allow Django to create, modify, and delete the table
+# Feel free to rename the models, but don't rename db_table values or field names.
+from __future__ import unicode_literals
+
+from django.db import models
+
+
+class Album(models.Model):
+    sequence = models.ForeignKey('Sequence', models.CASCADE, related_name="albums")
+    detector = models.ForeignKey('Detector', models.DO_NOTHING, related_name="albums")
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    created = models.DateTimeField(blank=True, null=True)
+    updated = models.DateTimeField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'album'
+
+    def __str__(self):
+        return (str(self.name))
+
+
+class Alert(models.Model):
+    request = models.OneToOneField('Request', models.CASCADE)
+    strategyobs = models.ForeignKey('StrategyObs', models.DO_NOTHING, related_name="alerts")
+    voevent_xml = models.TextField(blank=True, null=True)
+    type = models.CharField(max_length=45, blank=True, null=True)
+    client = models.CharField(max_length=45, blank=True, null=True)
+    burst_jd = models.CharField(max_length=45, blank=True, null=True)
+    burst_ra = models.CharField(max_length=45, blank=True, null=True)
+    burst_dec = models.CharField(max_length=45, blank=True, null=True)
+    equinox = models.CharField(max_length=45, blank=True, null=True)
+    jd_pkt = models.IntegerField(blank=True, null=True)
+    jd_send = models.IntegerField(blank=True, null=True)
+    jd_received = models.IntegerField(blank=True, null=True)
+    trigger_instrum = models.CharField(max_length=45, blank=True, null=True)
+    trigger_num = models.CharField(max_length=45, blank=True, null=True)
+    grb_error = models.CharField(max_length=45, blank=True, null=True)
+    def_not_grb = models.IntegerField(blank=True, null=True)
+    editor = models.CharField(max_length=45, blank=True, null=True)
+    flag = models.CharField(max_length=45, blank=True, null=True)
+    idgcn_notice = models.IntegerField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'alert'
+
+    def __str__(self):
+        return (self.request.name)
+
+
+class Country(models.Model):
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    quota = models.FloatField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'country'
+
+    def __str__(self):
+        return (str(self.name))
+
+
+class Detector(models.Model):
+    device = models.OneToOneField('Device', models.CASCADE)
+    telescope = models.ForeignKey('Telescope', models.DO_NOTHING, related_name="detectors")
+    status = models.CharField(max_length=7, blank=True, null=True)
+    nb_photo_x = models.IntegerField(blank=True, null=True)
+    nb_photo_y = models.IntegerField(blank=True, null=True)
+    photo_size_x = models.IntegerField(blank=True, null=True)
+    photo_size_y = models.IntegerField(blank=True, null=True)
+    has_shutter = models.IntegerField(blank=True, null=True)
+    equivalent_foc_len = models.CharField(max_length=45, blank=True, null=True)
+    acq_start = models.DateTimeField(blank=True, null=True)
+    acq_stop = models.DateTimeField(blank=True, null=True)
+    check_temp = models.FloatField(blank=True, null=True)
+    gain = models.FloatField(blank=True, null=True)
+    readout_noise = models.FloatField(blank=True, null=True)
+    readout_time = models.FloatField(blank=True, null=True)
+    idcam_readout_mode = models.IntegerField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'detector'
+
+    def __str__(self):
+        return (self.device.name)
+
+class Device(models.Model):
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    created = models.DateTimeField(blank=True, null=True)
+    updated = models.DateTimeField(blank=True, null=True)
+    is_online = models.IntegerField(blank=True, null=True)
+    status = models.CharField(max_length=11, blank=True, null=True)
+    maintenance_date = models.DateTimeField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'device'
+
+    def __str__(self):
+        return (str(self.name))
+
+class Filter(models.Model):
+    device = models.OneToOneField(Device, models.CASCADE)
+    detector = models.ForeignKey(Detector, models.DO_NOTHING, related_name="filters")
+    category = models.CharField(max_length=1, blank=True, null=True)
+    transmission_curve_doc = models.CharField(max_length=45, blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'filter'
+
+    def __str__(self):
+        return (self.device.name)
+
+
+class Image(models.Model):
+    plan = models.ForeignKey('Plan', models.CASCADE, related_name="images")
+    nrtanalysis = models.ForeignKey('NrtAnalysis', models.DO_NOTHING, blank=True, null=True, related_name="images")
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    created = models.DateTimeField(blank=True, null=True)
+    updated = models.DateTimeField(blank=True, null=True)
+    date_from_gps = models.CharField(max_length=45, blank=True, null=True)
+    level = models.IntegerField(blank=True, null=True)
+    type = models.CharField(max_length=5, blank=True, null=True)
+    quality = models.CharField(max_length=45, blank=True, null=True)
+    flaggps = models.CharField(max_length=45, blank=True, null=True)
+    exposure = models.CharField(max_length=45, blank=True, null=True)
+    tempext = models.CharField(max_length=45, blank=True, null=True)
+    pressure = models.CharField(max_length=45, blank=True, null=True)
+    humidext = models.CharField(max_length=45, blank=True, null=True)
+    wind = models.CharField(max_length=45, blank=True, null=True)
+    wind_dir = models.CharField(max_length=45, blank=True, null=True)
+    dwnimg = models.CharField(max_length=45, blank=True, null=True)
+    dwncata = models.CharField(max_length=45, blank=True, null=True)
+    dwn = models.CharField(max_length=45, blank=True, null=True)
+    level0_fits_name = models.CharField(max_length=45, blank=True, null=True)
+    level1a_fits_name = models.CharField(max_length=45, blank=True, null=True)
+    level1b_fits_name = models.CharField(max_length=45, blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'image'
+
+    def __str__(self):
+        return (str(self.name))
+
+
+class NrtAnalysis(models.Model):
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    created = models.DateTimeField(blank=True, null=True)
+    updated = models.DateTimeField(blank=True, null=True)
+    analysis = models.TextField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'nrtanalysis'
+
+    def __str__(self):
+        return (str(self.name))
+
+
+class Plan(models.Model):
+    album = models.ForeignKey(Album, models.CASCADE, related_name="plans")
+    filter = models.ForeignKey(Filter, models.DO_NOTHING, related_name="plans")
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.CharField(max_length=45, blank=True, null=True)
+    created = models.DateTimeField(blank=True, null=True)
+    updated = models.DateTimeField(blank=True, null=True)
+    duration = models.FloatField(blank=True, null=True)
+    position = models.CharField(max_length=45, blank=True, null=True)
+    exposure_time = models.FloatField(blank=True, null=True)
+    nb_images = models.IntegerField(blank=True, null=True)
+    dithering = models.IntegerField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'plan'
+
+    def __str__(self):
+        return (str(self.name))
+
+
+class Request(models.Model):
+    user = models.ForeignKey('User', models.DO_NOTHING, related_name="requests")
+    scientificprogram = models.ForeignKey('ScientificProgram', models.DO_NOTHING, related_name="requests")
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    created = models.DateTimeField(blank=True, null=True)
+    updated = models.DateTimeField(blank=True, null=True)
+    is_alert = models.IntegerField(blank=True, null=True)
+    type = models.CharField(max_length=8, blank=True, null=True)
+    status = models.CharField(max_length=10, blank=True, null=True)
+    target_or_theme = models.CharField(max_length=45, blank=True, null=True)
+    priority = models.IntegerField(blank=True, null=True)
+    autodeposit = models.IntegerField(blank=True, null=True)
+    checkpoint = models.CharField(max_length=45, blank=True, null=True)
+    flag = models.CharField(max_length=45, blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'request'
+
+    def __str__(self):
+        return (str(self.name))
+
+
+class Schedule(models.Model):
+    created = models.DateTimeField(blank=True, null=True)
+    day_start = models.DateTimeField(blank=True, null=True)
+    day_stop = models.DateTimeField(blank=True, null=True)
+    flag = models.CharField(max_length=45, blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'schedule'
+
+    def __str__(self):
+        return (str(self.created))
+
+
+class ScheduleHistory(models.Model):
+    sequences = models.ManyToManyField('Sequence', related_name='schedulehistorys')
+    created = models.DateTimeField(blank=True, null=True)
+    day_start = models.DateTimeField(blank=True, null=True)
+    day_stop = models.DateTimeField(blank=True, null=True)
+    flag = models.CharField(max_length=45, blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'schedulehistory'
+
+    def __str__(self):
+        return (str(self.created))
+
+
+class ScientificProgram(models.Model):
+    users = models.ManyToManyField('User', related_name="scientificprograms") 
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    quota = models.FloatField(blank=True, null=True)
+    priority = models.IntegerField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'scientificprogram'
+
+    def __str__(self):
+        return (str(self.name))
+
+class Sequence(models.Model):
+    request = models.ForeignKey(Request, models.CASCADE, related_name="sequences")
+    sequencetype = models.ForeignKey('SequenceType', models.DO_NOTHING, related_name="sequences")
+    schedule = models.ForeignKey(Schedule, models.DO_NOTHING, related_name="sequences")
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    created = models.DateTimeField(blank=True, null=True)
+    updated = models.DateTimeField(blank=True, null=True)
+    is_alert = models.IntegerField(blank=True, null=True)
+    status = models.CharField(max_length=11, blank=True, null=True)
+    duration = models.FloatField(blank=True, null=True)
+    pointing = models.CharField(max_length=45, blank=True, null=True)
+    with_drift = models.IntegerField(blank=True, null=True)
+    priority = models.IntegerField(blank=True, null=True)
+    analysis_method = models.CharField(max_length=45, blank=True, null=True)
+    exec_start = models.DateTimeField()
+    exec_stop = models.DateTimeField(blank=True, null=True)
+    moon_min = models.IntegerField(blank=True, null=True)
+    alt_min = models.IntegerField(blank=True, null=True)
+    type = models.CharField(max_length=6, blank=True, null=True)
+    img_current = models.CharField(max_length=45, blank=True, null=True)
+    img_total = models.CharField(max_length=45, blank=True, null=True)
+    not_obs = models.IntegerField(blank=True, null=True)
+    obsolete = models.IntegerField(blank=True, null=True)
+    processing = models.IntegerField(blank=True, null=True)
+    flag = models.CharField(max_length=45, blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'sequence'
+
+    def __str__(self):
+        return (str(self.name))
+
+
+class SequenceType(models.Model):
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    priority = models.IntegerField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'sequencetype'
+
+    def __str__(self):
+        return (str(self.name))
+
+
+class SiteWatch(models.Model):
+    updated = models.DateTimeField(blank=True, null=True)
+    lights = models.CharField(max_length=45, blank=True, null=True)
+    dome = models.CharField(max_length=45, blank=True, null=True)
+    doors = models.CharField(max_length=45, blank=True, null=True)
+    temperature = models.FloatField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'sitewatch'
+
+    def __str__(self):
+        return (str(self.updated))
+
+
+class SiteWatchHistory(models.Model):
+    id = models.IntegerField(primary_key=True)
+
+    class Meta:
+        managed = True
+        db_table = 'sitewatchhistory'
+
+
+class StrategyObs(models.Model):
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    json_file = models.CharField(max_length=45, blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'strategyobs'
+
+    def __str__(self):
+        return (str(self.name))
+
+
+class Telescope(models.Model):
+    device = models.OneToOneField(Device, models.CASCADE)
+    mount_type = models.CharField(max_length=9, blank=True, null=True)
+    diameter = models.FloatField(blank=True, null=True)
+    status = models.CharField(max_length=45, blank=True, null=True)
+    latitude = models.FloatField(blank=True, null=True)
+    longitude = models.FloatField(blank=True, null=True)
+    sens = models.CharField(max_length=1, blank=True, null=True)
+    altitude = models.FloatField(blank=True, null=True)
+    readout_time = models.IntegerField(blank=True, null=True)
+    slew_time = models.IntegerField(blank=True, null=True)
+    slew_dead = models.IntegerField(blank=True, null=True)
+    slew_rate_max = models.FloatField(blank=True, null=True)
+    horizon_type = models.CharField(max_length=45, blank=True, null=True)
+    horizon_def = models.FloatField(blank=True, null=True)
+    lim_dec_max = models.FloatField(blank=True, null=True)
+    lim_dec_min = models.FloatField(blank=True, null=True)
+    lim_ha_rise = models.FloatField(blank=True, null=True)
+    lim_ha_set = models.FloatField(blank=True, null=True)
+    address = models.CharField(max_length=45, blank=True, null=True)
+    night_elev_sun = models.FloatField(blank=True, null=True)
+    mpc_code = models.CharField(max_length=45, blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'telescope'
+
+    def __str__(self):
+        return (self.device.name)
+
+
+class User(models.Model):
+    country = models.ForeignKey(Country, models.DO_NOTHING, related_name="users")
+    userlevel = models.ForeignKey('UserLevel', models.DO_NOTHING, related_name="users")
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    created = models.DateTimeField(blank=True, null=True)
+    updated = models.DateTimeField(blank=True, null=True)
+    firstname = models.CharField(max_length=45, blank=True, null=True)
+    email = models.CharField(max_length=45, blank=True, null=True)
+    url = models.CharField(max_length=45, blank=True, null=True)
+    tel1 = models.CharField(max_length=45, blank=True, null=True)
+    tel2 = models.CharField(max_length=45, blank=True, null=True)
+    address = models.CharField(max_length=45, blank=True, null=True)
+    login = models.CharField(max_length=15, blank=True, null=True)
+    pass_field = models.CharField(db_column='pass', max_length=45, blank=True, null=True)  # Field renamed because it was a Python reserved word.
+    last_connect = models.DateTimeField(blank=True, null=True)
+    cur_connect = models.DateTimeField(blank=True, null=True)
+    putvalid_beg = models.DateTimeField(blank=True, null=True)
+    putvalid_end = models.DateTimeField(blank=True, null=True)
+    acqvalid_beg = models.CharField(max_length=45, blank=True, null=True)
+    acqvalid_end = models.CharField(max_length=45, blank=True, null=True)
+    quota = models.FloatField(blank=True, null=True)
+    quota_rea = models.FloatField(blank=True, null=True)
+    u_priority = models.IntegerField(blank=True, null=True)
+    p_priority = models.IntegerField(blank=True, null=True)
+    dir_level = models.IntegerField(blank=True, null=True)
+    can_del_void_req = models.IntegerField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'user'
+
+    def __str__(self):
+        return (str(self.name))
+
+
+class UserLevel(models.Model):
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    priority = models.IntegerField(blank=True, null=True)
+    quota = models.FloatField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'userlevel'
+
+    def __str__(self):
+        return (str(self.name))
+
+
+class WeatherWatch(models.Model):
+    updated = models.DateTimeField(blank=True, null=True)
+    humid_int = models.FloatField(blank=True, null=True)
+    humid_ext = models.FloatField(blank=True, null=True)
+    wind = models.FloatField(blank=True, null=True)
+    wind_dir = models.CharField(max_length=1, blank=True, null=True)
+    temp_int = models.FloatField(blank=True, null=True)
+    temp_ext = models.FloatField(blank=True, null=True)
+    pressure = models.FloatField(blank=True, null=True)
+    rain = models.FloatField(blank=True, null=True)
+    dwn = models.CharField(max_length=45, blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'weatherwatch'
+
+    def __str__(self):
+        return (str(self.updated))
+
+
+class WeatherWatchHistory(models.Model):
+    datetime = models.DateTimeField(blank=True, null=True)
+    humid_int = models.CharField(max_length=45, blank=True, null=True)
+    humid_ext = models.CharField(max_length=45, blank=True, null=True)
+    wind = models.CharField(max_length=45, blank=True, null=True)
+    wind_dir = models.CharField(max_length=45, blank=True, null=True)
+    temp_int = models.CharField(max_length=45, blank=True, null=True)
+    temp_ext = models.CharField(max_length=45, blank=True, null=True)
+    pressure = models.CharField(max_length=45, blank=True, null=True)
+    rain = models.CharField(max_length=45, blank=True, null=True)
+    dwn = models.CharField(max_length=45, blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'weatherwatchhistory'
+
+    def __str__(self):
+        return (str(self.datetime))