mirror of
https://github.com/GFDRR/sms-lapli.git
synced 2026-10-26 17:35:19 +00:00
fix log
This commit is contained in:
1 parent
695a9a1f35
commit
279bda28c1
2 files changed
+14
-16
No files matched your search
@@ -110,13 +110,6 @@ class LogAdmin(admin.ModelAdmin):
|
||||
search_fields = ["timestamp"]
|
||||
# form = LogForm
|
||||
|
||||
# class ObservationTemperatureAdmin(admin.ModelAdmin):
|
||||
#
|
||||
#
|
||||
# class ObservationDirectionVentAdmin(admin.ModelAdmin):
|
||||
#
|
||||
# class ObservationHumiditeAdmin(admin.ModelAdmin):
|
||||
|
||||
|
||||
#Added all in the register
|
||||
admin.site.register(Station, StationAdmin)
|
||||
@@ -125,7 +118,3 @@ admin.site.register(Observation, ObservationAdmin)
|
||||
admin.site.register(UniteDeMesure, UniteDeMesureAdmin)
|
||||
admin.site.register(StationObservers, StationObserversAdmin)
|
||||
admin.site.register(Log, LogAdmin)
|
||||
|
||||
# admin.site.register(ObservationTemperature)
|
||||
# admin.site.register(ObservationDirectionVent)
|
||||
# admin.site.register(ObservationHumidite)
|
||||
+14
-5
@@ -102,11 +102,7 @@ class SmsGateway(AppBase):
|
||||
recup_last_value.quantitePluie = val_float
|
||||
recup_last_value.save()
|
||||
info = 'Donnee mise a jour'
|
||||
log.observation = recup_last_value
|
||||
log.observer = person
|
||||
log.quantitePluie = val_float
|
||||
log.timestamp = timezone.now().date()
|
||||
log.save()
|
||||
# logSave(log, recup_last_value, person, val_float)
|
||||
else:
|
||||
o = Observation()
|
||||
o.idStation = station
|
||||
@@ -118,7 +114,13 @@ class SmsGateway(AppBase):
|
||||
o.valider = False
|
||||
o.save()
|
||||
info = 'Donnee sauvegardee. Merci!'
|
||||
# logSave(log, recup_last_value, person, val_float)
|
||||
|
||||
log.observation = recup_last_value
|
||||
log.observer = person
|
||||
log.quantitePluie = val_float
|
||||
log.timestamp = timezone.now().date()
|
||||
log.save()
|
||||
msg.respond(info)
|
||||
return True
|
||||
else:
|
||||
@@ -126,3 +128,10 @@ class SmsGateway(AppBase):
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
def logSave(log, recup_last_value, person, val_float):
|
||||
log.observation = recup_last_value
|
||||
log.observer = person
|
||||
log.quantitePluie = val_float
|
||||
log.timestamp = timezone.now().date()
|
||||
log.save()
|
||||
Reference in new issue
Block a user