backend: use a new team field 'active', to avoid some team generation

admin/static/views/team-edit.html

@@ -15,9 +15,17 @@
 <form ng-submit="saveTeam()">
   <div class="row" ng-if="team.id">
     <label for="idTeam" class="col-sm-2 col-form-label-sm">Identifiant</label>
-    <div class="col-sm-10">
+    <div class="col-sm-auto">
       <input type="text" readonly class="form-control-sm form-control-plaintext" ng-model="team.id">
     </div>
+    <div class="col-sm">
+      <div class="form-check">
+	<label class="custom-control custom-checkbox">
+	  <input class="custom-control-input" type="checkbox" ng-model="team.active">
+	  <span class="custom-control-label">Équipe active (inclure lors des générations)</span>
+	</label>
+      </div>
+    </div>
   </div>
   <div class="row" ng-repeat="field in fields">
     <label for="{{ field }}" class="col-sm-2 col-form-label-sm">{{ field | capitalize }}</label>

admin/static/views/team-list.html

@@ -15,7 +15,7 @@
     </tr>
   </thead>
   <tbody>
-    <tr ng-repeat="team in teams | filter: query" ng-click="show(team.id)">
+    <tr ng-repeat="team in teams | filter: query" ng-click="show(team.id)" ng-class="{'bg-warning': !team.active}">
       <td ng-repeat="field in fields">
 	{{ team[field] }}
       </td>

backend/generation.go

@@ -125,7 +125,7 @@ func genAll() {
 		log.Println("events.json generation error: ", err)
 	} else if err = genMyPublicFile(); err != nil {
 		log.Println("MyPublic generation error: ", err)
-	} else if teams, err := fic.GetTeams(); err != nil {
+	} else if teams, err := fic.GetActiveTeams(); err != nil {
 		log.Println("Team retrieval error: ", err)
 	} else {
 		for _, team := range(teams) {

libfic/db.go

@@ -84,7 +84,8 @@ CREATE TABLE IF NOT EXISTS themes(
 CREATE TABLE IF NOT EXISTS teams(
   id_team INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
   name VARCHAR(255) NOT NULL,
-  color INTEGER NOT NULL
+  color INTEGER NOT NULL,
+  active BOOLEAN NOT NULL DEFAULT 1
 ) DEFAULT CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;
 `); err != nil {
 		return err

libfic/team.go

@@ -17,11 +17,11 @@ type Team struct {
 	Id          int64  `json:"id"`
 	Name        string `json:"name"`
 	Color       uint32 `json:"color"`
+	Active      bool   `json:"active"`
 }
 
-// GetTeams returns a list of registered Team from the database.
-func GetTeams() ([]Team, error) {
-	if rows, err := DBQuery("SELECT id_team, name, color FROM teams"); err != nil {
+func getTeams(filter string) ([]Team, error) {
+	if rows, err := DBQuery("SELECT id_team, name, color, active FROM teams " + filter); err != nil {
 		return nil, err
 	} else {
 		defer rows.Close()
@@ -29,7 +29,7 @@ func GetTeams() ([]Team, error) {
 		var teams = make([]Team, 0)
 		for rows.Next() {
 			var t Team
-			if err := rows.Scan(&t.Id, &t.Name, &t.Color); err != nil {
+			if err := rows.Scan(&t.Id, &t.Name, &t.Color, &t.Active); err != nil {
 				return nil, err
 			}
 			teams = append(teams, t)
@@ -42,10 +42,20 @@ func GetTeams() ([]Team, error) {
 	}
 }
 
+// GetTeams returns a list of registered Team from the database.
+func GetTeams() ([]Team, error) {
+	return getTeams("")
+}
+
+// GetActiveTeams returns a list of registered Team from the database, limited to team to generate.
+func GetActiveTeams() ([]Team, error) {
+	return getTeams("WHERE active = 1")
+}
+
 // GetTeam retrieves a Team from its identifier.
 func GetTeam(id int64) (Team, error) {
 	var t Team
-	if err := DBQueryRow("SELECT id_team, name, color FROM teams WHERE id_team = ?", id).Scan(&t.Id, &t.Name, &t.Color); err != nil {
+	if err := DBQueryRow("SELECT id_team, name, color, active FROM teams WHERE id_team = ?", id).Scan(&t.Id, &t.Name, &t.Color, &t.Active); err != nil {
 		return t, err
 	}
 
@@ -55,7 +65,7 @@ func GetTeam(id int64) (Team, error) {
 // GetTeamBySerial retrieves a Team from one of its associated certificates.
 func GetTeamBySerial(serial int64) (Team, error) {
 	var t Team
-	if err := DBQueryRow("SELECT T.id_team, T.name, T.color FROM certificates C INNER JOIN teams T ON T.id_team = C.id_team WHERE id_cert = ?", serial).Scan(&t.Id, &t.Name, &t.Color); err != nil {
+	if err := DBQueryRow("SELECT T.id_team, T.name, T.color, T.active FROM certificates C INNER JOIN teams T ON T.id_team = C.id_team WHERE id_cert = ?", serial).Scan(&t.Id, &t.Name, &t.Color, &t.Active); err != nil {
 		return t, err
 	}
 
@@ -69,13 +79,13 @@ func CreateTeam(name string, color uint32) (Team, error) {
 	} else if tid, err := res.LastInsertId(); err != nil {
 		return Team{}, err
 	} else {
-		return Team{tid, name, color}, nil
+		return Team{tid, name, color, true}, nil
 	}
 }
 
 // Update applies modifications back to the database.
 func (t Team) Update() (int64, error) {
-	if res, err := DBExec("UPDATE teams SET name = ?, color = ? WHERE id_team = ?", t.Name, t.Color, t.Id); err != nil {
+	if res, err := DBExec("UPDATE teams SET name = ?, color = ?, active = ? WHERE id_team = ?", t.Name, t.Color, t.Active, t.Id); err != nil {
 		return 0, err
 	} else if nb, err := res.RowsAffected(); err != nil {
 		return 0, err