diff --git a/controllers/addTemp.go b/controllers/addTemp.go index a5a7e62..760e221 100644 --- a/controllers/addTemp.go +++ b/controllers/addTemp.go @@ -9,12 +9,17 @@ import ( "datahouse/models/temperature" temperatureTmp "datahouse/models/temperature/temp" "datahouse/models/sensor" + "datahouse/models/variables" ) type AddTempController struct { beego.Controller } +func (c *AddTempController) Prepare() { + c.Data["version"] = variables.Version +} + func (c *AddTempController) Get() { mac := c.Ctx.Input.Param(":sensor") val, _ := strconv.Atoi(c.Ctx.Input.Param(":val")) diff --git a/controllers/default.go b/controllers/default.go index 9d8561f..73bbf0c 100644 --- a/controllers/default.go +++ b/controllers/default.go @@ -4,8 +4,8 @@ import ( "github.com/astaxie/beego" "datahouse/models/sensor" - // "datahouse/models/temperature" temperatureTmp "datahouse/models/temperature/temp" + "datahouse/models/variables" "strconv" "time" @@ -27,6 +27,10 @@ type MainController struct { beego.Controller } +func (c *MainController) Prepare() { + c.Data["version"] = variables.Version +} + func (c *MainController) Get() { c.Data["sensors"] = getLastTemps() c.TplNames = "index.tpl" diff --git a/controllers/sensors.go b/controllers/sensors.go index d4f9413..691f44b 100644 --- a/controllers/sensors.go +++ b/controllers/sensors.go @@ -4,6 +4,7 @@ import ( "github.com/astaxie/beego" "datahouse/models/sensor" + "datahouse/models/variables" "strconv" ) @@ -12,6 +13,12 @@ type SensorsController struct { beego.Controller } +func (c *SensorsController) Prepare() { + c.Data["IsSensor"] = true + c.Data["version"] = variables.Version +} + + func (c *SensorsController) Get() { sensors := sensor.GetAllSensor() diff --git a/controllers/viewTemp.go b/controllers/viewTemp.go index c3b5da1..5137834 100644 --- a/controllers/viewTemp.go +++ b/controllers/viewTemp.go @@ -5,6 +5,7 @@ import ( "datahouse/models/temperature" "datahouse/models/sensor" + "datahouse/models/variables" "html/template" "strconv" @@ -17,7 +18,8 @@ type ViewTempController struct { } func (c *ViewTempController) Prepare() { - c.Data["IsViewTemp"] = true; + c.Data["IsViewTemp"] = true + c.Data["version"] = variables.Version } func (c *ViewTempController) Get() { diff --git a/models/variables/variables.go b/models/variables/variables.go new file mode 100644 index 0000000..53b42c1 --- /dev/null +++ b/models/variables/variables.go @@ -0,0 +1,5 @@ +package variables + +const ( + Version = "0.0.3" +) diff --git a/views/base/footer.html b/views/base/footer.html index 7fd532c..0a9664a 100644 --- a/views/base/footer.html +++ b/views/base/footer.html @@ -1,7 +1,7 @@