From 0a5a6e6a4b6eb0f3e9552f8db762914641c8cc28 Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Wed, 22 Sep 2021 15:23:58 +0800
Subject: [PATCH] [status page] fix monitor order

---
 server/model/group.js                                | 1 +
 server/socket-handlers/status-page-socket-handler.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/server/model/group.js b/server/model/group.js
index 8e61f938..567f3865 100644
--- a/server/model/group.js
+++ b/server/model/group.js
@@ -24,6 +24,7 @@ class Group extends BeanModel {
             SELECT monitor.* FROM monitor, monitor_group
             WHERE monitor.id = monitor_group.monitor_id
             AND group_id = ?
+            ORDER BY monitor_group.weight
         `, [
             this.id,
         ]));
diff --git a/server/socket-handlers/status-page-socket-handler.js b/server/socket-handlers/status-page-socket-handler.js
index c8ca2e24..5826277c 100644
--- a/server/socket-handlers/status-page-socket-handler.js
+++ b/server/socket-handlers/status-page-socket-handler.js
@@ -124,6 +124,8 @@ module.exports.statusPageSocketHandler = (socket) => {
                 ]);
 
                 let monitorOrder = 1;
+                console.log(group.monitorList);
+
                 for (let monitor of group.monitorList) {
                     let relationBean = R.dispense("monitor_group");
                     relationBean.weight = monitorOrder++;