mirror of
https://github.com/ZSCNetSupportDept/scheduler.git
synced 2025-10-28 20:45:05 +08:00
增加值班表格的行名称,改一下模板里的border
This commit is contained in:
@@ -12,17 +12,19 @@ import (
|
|||||||
"zsxyww.com/scheduler/signals"
|
"zsxyww.com/scheduler/signals"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var data *[7][]string
|
||||||
|
var err error
|
||||||
|
|
||||||
func GetAssignment(i echo.Context) error {
|
func GetAssignment(i echo.Context) error {
|
||||||
if (carbon.Now().ToDateString() != signals.Table.LastUpdated.ToDateString()) || signals.Table.NeedUpdate == true {
|
if (carbon.Now().ToDateString() != signals.Table.LastUpdated.ToDateString()) || signals.Table.NeedUpdate == true {
|
||||||
fmt.Printf("At %v:start regenerate table", carbon.Now())
|
fmt.Printf("At %v:start regenerate table", carbon.Now())
|
||||||
data, err := generateTable()
|
data, err = generateTable()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
i.String(http.StatusInternalServerError, err.Error())
|
i.String(http.StatusInternalServerError, err.Error())
|
||||||
return echo.ErrInternalServerError
|
return echo.ErrInternalServerError
|
||||||
}
|
}
|
||||||
i.Render(http.StatusOK, "table.html", data)
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
i.Render(http.StatusOK, "table.html", data)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
func generateTable() (*[7][]string, error) {
|
func generateTable() (*[7][]string, error) {
|
||||||
@@ -40,6 +42,14 @@ func generateTable() (*[7][]string, error) {
|
|||||||
female := []*model.Member{} //今天的女生
|
female := []*model.Member{} //今天的女生
|
||||||
male := []*model.Member{} //今天的男生
|
male := []*model.Member{} //今天的男生
|
||||||
|
|
||||||
|
table[0] = append(table[0], "凤翔")
|
||||||
|
table[1] = append(table[1], "朝晖")
|
||||||
|
table[2] = append(table[2], "香晖AB")
|
||||||
|
table[3] = append(table[3], "香晖CD")
|
||||||
|
table[4] = append(table[4], "东门")
|
||||||
|
table[5] = append(table[5], "北门")
|
||||||
|
table[6] = append(table[6], "歧头")
|
||||||
|
|
||||||
for _, i := range members {
|
for _, i := range members {
|
||||||
if i.FreeDay == dayOfWeek {
|
if i.FreeDay == dayOfWeek {
|
||||||
today = append(today, i)
|
today = append(today, i)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<table>
|
<table border=1>
|
||||||
{{range .}} <!-- 遍历外层切片 -->
|
{{range .}} <!-- 遍历外层切片 -->
|
||||||
<tr>
|
<tr>
|
||||||
{{range .}} <!-- 遍历内层切片 -->
|
{{range .}} <!-- 遍历内层切片 -->
|
||||||
|
|||||||
Reference in New Issue
Block a user