chore: worked on #46, closes #45

logic/models/edit.go

@@ -99,12 +99,14 @@ func handleEdit(handle *Handle) {
 		case TRAINING:
 
 			type defrow struct {
+				Id            string
 				Status        int
 				EpochProgress int
+				Epoch         int
 				Accuracy      float64
 			}
 
-			def_rows, err := c.Db.Query("select status, epoch_progress, accuracy from model_definition where model_id=$1", model.Id)
+			def_rows, err := c.Db.Query("select id, status, epoch, epoch_progress, accuracy from model_definition where model_id=$1 order by created_on asc", model.Id)
 			if err != nil {
 				return c.Error500(err)
 			}
@@ -114,16 +116,54 @@ func handleEdit(handle *Handle) {
 
 			for def_rows.Next() {
 				var def defrow
-				err = def_rows.Scan(&def.Status, &def.EpochProgress, &def.Accuracy)
+				err = def_rows.Scan(&def.Id, &def.Status, &def.Epoch, &def.EpochProgress, &def.Accuracy)
 				if err != nil {
 					return c.Error500(err)
 				}
 				defs = append(defs, def)
 			}
 
+			type layerdef struct {
+				LayerType int
+				Shape     string
+			}
+
+			layers := []layerdef{}
+
+			for _, def := range defs {
+				if def.Status == MODEL_DEFINITION_STATUS_TRAINING {
+					rows, err := c.Db.Query("select layer_type, shape from model_definition_layer where def_id=$1 order by layer_order asc;", def.Id)
+					if err != nil {
+						return c.Error500(err)
+					}
+					defer rows.Close()
+
+					for rows.Next() {
+						var layerdef layerdef
+						err = rows.Scan(&layerdef.LayerType, &layerdef.Shape)
+						if err != nil {
+							return c.Error500(err)
+						}
+						layers = append(layers, layerdef)
+					}
+					break
+				}
+			}
+
+			sep_mod := 100
+			if len(layers) > 8 {
+				sep_mod = 100 - (len(layers)-8)*10
+			}
+
+			if sep_mod < 10 {
+				sep_mod = 10
+			}
+
 			LoadBasedOnAnswer(c.Mode, w, "/models/edit.html", c.AddMap(AnyMap{
-				"Model": model,
-				"Defs":  defs,
+				"Model":  model,
+				"Defs":   defs,
+				"Layers": layers,
+				"SepMod": sep_mod,
 			}))
 		case PREPARING_ZIP_FILE:
 			LoadBasedOnAnswer(c.Mode, w, "/models/edit.html", c.AddMap(AnyMap{