@@ -38,23 +38,6 @@ def generate_resources_reservations
38
38
data += MW ::LINE_FEED
39
39
data += "{|\n "
40
40
data += "|bgcolor=\" #aaaaaa\" colspan=\" 8\" |\n "
41
- data += "'''Monika''' ''(current placement and queued jobs status)''\n "
42
- data += "|-\n "
43
-
44
- # Loop over Grid'5000 sites for Monika's links
45
- @site_uids . sort . each do |site_uid |
46
- if has_queue_production? ( site_uid )
47
- data += "|bgcolor=\" #ffffff\" valign=\" top\" style=\" border:1px solid #cccccc;padding:1em;padding-top:0.5em;\" |\n "
48
- data += "[https://intranet.grid5000.fr/oar/#{ site_uid . capitalize } /monika.cgi '''#{ site_uid . capitalize } ''']<br>\n "
49
- data += "[https://intranet.grid5000.fr/oar/#{ site_uid . capitalize } /monika-prod.cgi '''#{ site_uid . capitalize } (production)''']\n "
50
- else
51
- data += "|bgcolor=\" #ffffff\" valign=\" top\" style=\" border:1px solid #cccccc;padding:1em;padding-top:0.5em;\" |\n "
52
- data += "[https://intranet.grid5000.fr/oar/#{ site_uid . capitalize } /monika.cgi '''#{ site_uid . capitalize } ''']\n "
53
- end
54
- end
55
-
56
- data += "|-\n "
57
- data += "|bgcolor=\" #aaaaaa\" colspan=\" 8\" |\n "
58
41
data += "'''Drawgantt''' ''(past, current and future OAR jobs scheduling)''\n "
59
42
data += "|-\n "
60
43
data += "|bgcolor=\" #eeeeee\" colspan=\" 8\" |\n "
@@ -96,6 +79,23 @@ def generate_resources_reservations
96
79
data += "[https://intranet.grid5000.fr/oar/#{ site_uid . capitalize } /drawgantt-svg-vlans/?relative_start=-28800&relative_stop=604800 vlans]\n "
97
80
end
98
81
82
+ data += "|-\n "
83
+ data += "|bgcolor=\" #aaaaaa\" colspan=\" 8\" |\n "
84
+ data += "'''Monika''' ''(current placement and queued jobs status)''\n "
85
+ data += "|-\n "
86
+
87
+ # Loop over Grid'5000 sites for Monika's links
88
+ @site_uids . sort . each do |site_uid |
89
+ if has_queue_production? ( site_uid )
90
+ data += "|bgcolor=\" #ffffff\" valign=\" top\" style=\" border:1px solid #cccccc;padding:1em;padding-top:0.5em;\" |\n "
91
+ data += "[https://intranet.grid5000.fr/oar/#{ site_uid . capitalize } /monika.cgi '''#{ site_uid . capitalize } ''']<br>\n "
92
+ data += "[https://intranet.grid5000.fr/oar/#{ site_uid . capitalize } /monika-prod.cgi '''#{ site_uid . capitalize } (production)''']\n "
93
+ else
94
+ data += "|bgcolor=\" #ffffff\" valign=\" top\" style=\" border:1px solid #cccccc;padding:1em;padding-top:0.5em;\" |\n "
95
+ data += "[https://intranet.grid5000.fr/oar/#{ site_uid . capitalize } /monika.cgi '''#{ site_uid . capitalize } ''']\n "
96
+ end
97
+ end
98
+
99
99
data += "|}\n "
100
100
end
101
101
0 commit comments