Compare commits
No commits in common. "master" and "filter_command" have entirely different histories.
master
...
filter_com
28 changed files with 263 additions and 806 deletions
|
|
@ -1,3 +1,3 @@
|
|||
# Probo Collector
|
||||
|
||||
A backend to collect quizzes in a RESTful way.
|
||||
A backend to collect quizzes in a RESTful way.
|
||||
|
|
|
|||
|
|
@ -5,11 +5,13 @@ package cmd
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
|
||||
"git.andreafazzi.eu/andrea/probo/cmd/filter"
|
||||
"git.andreafazzi.eu/andrea/probo/cmd/util"
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/charmbracelet/huh"
|
||||
"github.com/charmbracelet/lipgloss"
|
||||
"github.com/muesli/termenv"
|
||||
"github.com/spf13/cobra"
|
||||
|
|
@ -35,15 +37,32 @@ func runFilter(cmd *cobra.Command, args []string) {
|
|||
panic(err)
|
||||
}
|
||||
|
||||
f := util.LogToFile()
|
||||
if f != nil {
|
||||
defer f.Close()
|
||||
if len(args) < 1 {
|
||||
f := util.LogToFile()
|
||||
if f != nil {
|
||||
defer f.Close()
|
||||
}
|
||||
|
||||
lipgloss.SetColorProfile(termenv.TrueColor)
|
||||
|
||||
form := huh.NewForm(huh.NewGroup(
|
||||
huh.NewSelect[string]().
|
||||
Title("Choose the store you want to filter").
|
||||
Options(
|
||||
huh.NewOption("Participants", "participants"),
|
||||
huh.NewOption("Quizzes", "quizzes"),
|
||||
huh.NewOption("Responses", "responses"),
|
||||
).Value(&storeType),
|
||||
))
|
||||
|
||||
err = form.Run()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
} else {
|
||||
storeType = args[0]
|
||||
}
|
||||
|
||||
lipgloss.SetColorProfile(termenv.TrueColor)
|
||||
|
||||
storeType = args[0]
|
||||
|
||||
model, err := tea.NewProgram(
|
||||
filter.New(path, storeType, util.ReadStdin()),
|
||||
tea.WithOutput(os.Stderr),
|
||||
|
|
@ -58,4 +77,5 @@ func runFilter(cmd *cobra.Command, args []string) {
|
|||
if result.Result != "" {
|
||||
fmt.Fprintf(os.Stdout, result.Result)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,6 @@ var (
|
|||
filterTypeFormats = map[string]string{
|
||||
"participants": "👫 Participants filter 👫",
|
||||
"quizzes": "❓ Quizzes filter ❓",
|
||||
"responses": "📝 Responses filter 📝",
|
||||
"responses": "📝 Responsesfilter 📝",
|
||||
}
|
||||
)
|
||||
|
|
|
|||
59
cmd/rank.go
59
cmd/rank.go
|
|
@ -1,59 +0,0 @@
|
|||
/*
|
||||
Copyright © 2024 NAME HERE <EMAIL ADDRESS>
|
||||
*/
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"git.andreafazzi.eu/andrea/probo/cmd/rank"
|
||||
"git.andreafazzi.eu/andrea/probo/cmd/util"
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/charmbracelet/lipgloss"
|
||||
"github.com/muesli/termenv"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
// rankCmd represents the rank command
|
||||
var rankCmd = &cobra.Command{
|
||||
Use: "rank",
|
||||
Short: "Show a ranking from the given responses.",
|
||||
Long: util.RenderMarkdownTemplates("cli/*.tmpl", "cli/rank/*.tmpl"),
|
||||
Run: runRank,
|
||||
}
|
||||
|
||||
func runRank(cmd *cobra.Command, args []string) {
|
||||
path, err := cmd.Flags().GetString("input")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
f := util.LogToFile()
|
||||
if f != nil {
|
||||
defer f.Close()
|
||||
}
|
||||
|
||||
lipgloss.SetColorProfile(termenv.TrueColor)
|
||||
|
||||
model, err := tea.NewProgram(
|
||||
rank.New(path, util.ReadStdin()),
|
||||
tea.WithOutput(os.Stderr),
|
||||
).Run()
|
||||
if err != nil {
|
||||
fmt.Println("Error running program:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
result := model.(*rank.RankModel)
|
||||
|
||||
if result.Result != "" {
|
||||
fmt.Fprintf(os.Stdout, result.Result)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func init() {
|
||||
rootCmd.AddCommand(rankCmd)
|
||||
rootCmd.PersistentFlags().StringP("input", "i", "", "Specify an input file")
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
package rank
|
||||
|
||||
var (
|
||||
stateFormats = map[int][]string{
|
||||
BrowseState: []string{"BROWSE 📖", "Total scores: %d", "🟢"},
|
||||
ExecutingScriptState: []string{"EXE %s", "Executing script...", "🔴"},
|
||||
ErrorState: []string{"ERROR 📖", "%v", "🔴"},
|
||||
}
|
||||
)
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
package rank
|
||||
|
||||
import (
|
||||
"github.com/charmbracelet/bubbles/key"
|
||||
"github.com/remogatto/sugarfoam/components/group"
|
||||
"github.com/remogatto/sugarfoam/components/table"
|
||||
"github.com/remogatto/sugarfoam/components/viewport"
|
||||
)
|
||||
|
||||
type keyBindings struct {
|
||||
group *group.Model
|
||||
|
||||
quit, enter key.Binding
|
||||
}
|
||||
|
||||
func (k *keyBindings) ShortHelp() []key.Binding {
|
||||
keys := make([]key.Binding, 0)
|
||||
|
||||
current := k.group.Current()
|
||||
|
||||
switch item := current.(type) {
|
||||
case *table.Model:
|
||||
keys = append(
|
||||
keys,
|
||||
item.KeyMap.LineUp,
|
||||
item.KeyMap.LineDown,
|
||||
)
|
||||
|
||||
case *viewport.Model:
|
||||
keys = append(
|
||||
keys,
|
||||
item.KeyMap.Up,
|
||||
item.KeyMap.Down,
|
||||
)
|
||||
}
|
||||
|
||||
keys = append(
|
||||
keys,
|
||||
k.group.KeyMap.FocusNext,
|
||||
k.group.KeyMap.FocusPrev,
|
||||
k.quit,
|
||||
)
|
||||
|
||||
return keys
|
||||
}
|
||||
|
||||
func (k keyBindings) FullHelp() [][]key.Binding {
|
||||
return [][]key.Binding{
|
||||
{
|
||||
k.quit,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func newBindings(g *group.Model) *keyBindings {
|
||||
return &keyBindings{
|
||||
group: g,
|
||||
quit: key.NewBinding(
|
||||
key.WithKeys("esc"), key.WithHelp("esc", "quit app"),
|
||||
),
|
||||
}
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
package rank
|
||||
|
||||
import "git.andreafazzi.eu/andrea/probo/pkg/store/file"
|
||||
|
||||
type storeLoadedMsg struct {
|
||||
store *file.SessionFileStore
|
||||
}
|
||||
|
||||
type resultMsg struct {
|
||||
result []any
|
||||
}
|
||||
|
||||
type errorMsg struct {
|
||||
error error
|
||||
}
|
||||
|
||||
type scriptExecutedMsg struct {
|
||||
result string
|
||||
}
|
||||
448
cmd/rank/rank.go
448
cmd/rank/rank.go
|
|
@ -1,448 +0,0 @@
|
|||
package rank
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"cmp"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"slices"
|
||||
"strconv"
|
||||
"text/template"
|
||||
|
||||
"git.andreafazzi.eu/andrea/probo/pkg/models"
|
||||
"git.andreafazzi.eu/andrea/probo/pkg/store/file"
|
||||
|
||||
"github.com/charmbracelet/bubbles/key"
|
||||
"github.com/charmbracelet/bubbles/spinner"
|
||||
btTable "github.com/charmbracelet/bubbles/table"
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/charmbracelet/glamour"
|
||||
"github.com/charmbracelet/lipgloss"
|
||||
"github.com/d5/tengo/v2"
|
||||
"github.com/d5/tengo/v2/stdlib"
|
||||
foam "github.com/remogatto/sugarfoam"
|
||||
"github.com/remogatto/sugarfoam/components/group"
|
||||
"github.com/remogatto/sugarfoam/components/header"
|
||||
"github.com/remogatto/sugarfoam/components/help"
|
||||
"github.com/remogatto/sugarfoam/components/statusbar"
|
||||
"github.com/remogatto/sugarfoam/components/table"
|
||||
"github.com/remogatto/sugarfoam/components/viewport"
|
||||
"github.com/remogatto/sugarfoam/layout"
|
||||
"github.com/remogatto/sugarfoam/layout/tiled"
|
||||
)
|
||||
|
||||
var responseTmpl = `{{range $answer := .Answers}}
|
||||
{{$answer.Quiz|toMarkdown $.Width}}
|
||||
R: {{$answer|toLipgloss}}
|
||||
{{end}}
|
||||
`
|
||||
|
||||
type ParticipantScore struct {
|
||||
Participant *models.Participant `json:"participant"`
|
||||
Response *models.Response `json:"response"`
|
||||
Score int `json:"score"`
|
||||
}
|
||||
|
||||
type Rank struct {
|
||||
Scores []*ParticipantScore `json:"scores"`
|
||||
}
|
||||
|
||||
type RankModel struct {
|
||||
// UI
|
||||
viewport *viewport.Model
|
||||
table *table.Model
|
||||
group *group.Model
|
||||
help *help.Model
|
||||
statusBar *statusbar.Model
|
||||
spinner spinner.Model
|
||||
|
||||
// Layout
|
||||
document *layout.Layout
|
||||
|
||||
// Key bindings
|
||||
bindings *keyBindings
|
||||
|
||||
// json
|
||||
InputJson string
|
||||
Result string
|
||||
|
||||
// session
|
||||
rank *Rank
|
||||
|
||||
// response
|
||||
responseTmpl *template.Template
|
||||
|
||||
// filter file
|
||||
scriptFilePath string
|
||||
|
||||
// markdown
|
||||
mdRenderer *glamour.TermRenderer
|
||||
|
||||
state int
|
||||
}
|
||||
|
||||
func New(path string, stdin string) *RankModel {
|
||||
viewport := viewport.New()
|
||||
|
||||
table := table.New(table.WithRelWidths(10, 20, 30, 30, 10))
|
||||
table.Model.SetColumns([]btTable.Column{
|
||||
{Title: "Pos", Width: 5},
|
||||
{Title: "Token", Width: 10},
|
||||
{Title: "Lastname", Width: 40},
|
||||
{Title: "Firstname", Width: 40},
|
||||
{Title: "Score", Width: 5},
|
||||
})
|
||||
|
||||
group := group.New(
|
||||
group.WithItems(table, viewport),
|
||||
group.WithLayout(
|
||||
layout.New(
|
||||
layout.WithStyles(&layout.Styles{Container: lipgloss.NewStyle().Padding(1, 1)}),
|
||||
layout.WithItem(tiled.New(table, viewport)),
|
||||
),
|
||||
),
|
||||
)
|
||||
|
||||
bindings := newBindings(group)
|
||||
statusBar := statusbar.New(bindings)
|
||||
|
||||
s := spinner.New(
|
||||
spinner.WithStyle(
|
||||
lipgloss.NewStyle().Foreground(lipgloss.Color("265"))),
|
||||
)
|
||||
s.Spinner = spinner.Dot
|
||||
|
||||
header := header.New(
|
||||
header.WithContent(
|
||||
lipgloss.NewStyle().
|
||||
Bold(true).
|
||||
Border(lipgloss.NormalBorder(), false, false, true, false).
|
||||
Render("😎 Rank 😎"),
|
||||
),
|
||||
)
|
||||
|
||||
help := help.New(
|
||||
bindings,
|
||||
help.WithStyles(&foam.Styles{NoBorder: lipgloss.NewStyle().Padding(1, 1)}))
|
||||
|
||||
document := layout.New(
|
||||
layout.WithStyles(&layout.Styles{Container: lipgloss.NewStyle().Margin(1)}),
|
||||
layout.WithItem(header),
|
||||
layout.WithItem(group),
|
||||
layout.WithItem(help),
|
||||
layout.WithItem(statusBar),
|
||||
)
|
||||
|
||||
renderer, err := glamour.NewTermRenderer(
|
||||
glamour.WithStandardStyle("dracula"),
|
||||
glamour.WithWordWrap(80),
|
||||
)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
tmpl, err := template.New("response").
|
||||
Funcs(template.FuncMap{
|
||||
"toMarkdown": func(width int, quiz *models.Quiz) string {
|
||||
md, err := models.QuizToMarkdown(quiz)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
result, err := renderer.Render(md)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return result
|
||||
},
|
||||
"toLipgloss": func(answer *models.ParticipantAnswer) string {
|
||||
color := "#ff0000"
|
||||
if answer.Correct {
|
||||
color = "#00ff00"
|
||||
}
|
||||
return lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color(color)).Render(answer.Answer.Text)
|
||||
},
|
||||
}).
|
||||
Parse(responseTmpl)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return &RankModel{
|
||||
table: table,
|
||||
viewport: viewport,
|
||||
group: group,
|
||||
statusBar: statusBar,
|
||||
spinner: s,
|
||||
document: document,
|
||||
responseTmpl: tmpl,
|
||||
bindings: bindings,
|
||||
help: help,
|
||||
scriptFilePath: path,
|
||||
InputJson: stdin,
|
||||
mdRenderer: renderer,
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func (m *RankModel) Init() tea.Cmd {
|
||||
var cmds []tea.Cmd
|
||||
|
||||
cmds = append(cmds, m.group.Init(), m.executeScript(), m.spinner.Tick)
|
||||
|
||||
m.group.Focus()
|
||||
|
||||
return tea.Batch(cmds...)
|
||||
}
|
||||
|
||||
func (m *RankModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
var cmds []tea.Cmd
|
||||
|
||||
switch msg := msg.(type) {
|
||||
|
||||
case tea.WindowSizeMsg:
|
||||
m.handleWindowSize(msg)
|
||||
|
||||
case tea.KeyMsg:
|
||||
switch {
|
||||
case key.Matches(msg, m.bindings.quit):
|
||||
cmds = append(cmds, tea.Quit)
|
||||
}
|
||||
|
||||
case scriptExecutedMsg:
|
||||
m.handleScriptExecuted(msg)
|
||||
|
||||
case errorMsg:
|
||||
m.handleError(msg)
|
||||
m.state = ErrorState
|
||||
}
|
||||
|
||||
cmds = m.handleState(msg, cmds)
|
||||
|
||||
return m, tea.Batch(cmds...)
|
||||
}
|
||||
|
||||
func (m *RankModel) View() string {
|
||||
return m.document.View()
|
||||
}
|
||||
|
||||
func (m *RankModel) executeScript() tea.Cmd {
|
||||
return func() tea.Msg {
|
||||
if m.scriptFilePath == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
rankJson, err := json.Marshal(Rank{Scores: make([]*ParticipantScore, 0)})
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
script, err := os.ReadFile(m.scriptFilePath)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
s := tengo.NewScript(script)
|
||||
|
||||
s.SetImports(stdlib.GetModuleMap("fmt", "json", "rand", "times"))
|
||||
_ = s.Add("input", m.InputJson)
|
||||
_ = s.Add("output", string(rankJson))
|
||||
|
||||
c, err := s.Compile()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
if err := c.Run(); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return scriptExecutedMsg{fmt.Sprintf("%s", c.Get("output"))}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
func (m *RankModel) showErrorOnStatusBar(err error) {
|
||||
m.statusBar.SetContent(
|
||||
stateFormats[ErrorState][0],
|
||||
fmt.Sprintf(stateFormats[ErrorState][1], err),
|
||||
stateFormats[ErrorState][2],
|
||||
)
|
||||
}
|
||||
|
||||
func (m *RankModel) updateTableContent() {
|
||||
rows := make([]btTable.Row, 0)
|
||||
|
||||
for i, score := range m.rank.Scores {
|
||||
rows = append(rows, btTable.Row{
|
||||
strconv.Itoa(i + 1),
|
||||
score.Participant.Token,
|
||||
score.Participant.Lastname,
|
||||
score.Participant.Firstname,
|
||||
strconv.Itoa(score.Score),
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
m.table.SetRows(rows)
|
||||
}
|
||||
|
||||
func (m *RankModel) updateViewportContent() {
|
||||
if len(m.table.Rows()) == 0 {
|
||||
panic(errors.New("No scores available!"))
|
||||
}
|
||||
|
||||
currentPos := m.table.SelectedRow()[0]
|
||||
|
||||
pos, err := strconv.Atoi(currentPos)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
currentResponse := m.rank.Scores[pos-1]
|
||||
|
||||
var buf bytes.Buffer
|
||||
|
||||
var response struct {
|
||||
*models.Response
|
||||
Width int
|
||||
} = struct {
|
||||
*models.Response
|
||||
Width int
|
||||
}{currentResponse.Response, m.viewport.GetWidth()}
|
||||
|
||||
err = m.responseTmpl.Execute(&buf, response)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
m.viewport.SetContent(buf.String())
|
||||
}
|
||||
|
||||
func (m *RankModel) handleWindowSize(msg tea.WindowSizeMsg) {
|
||||
m.group.SetSize(msg.Width, msg.Height)
|
||||
m.document.SetSize(msg.Width, msg.Height)
|
||||
m.mdRenderer = m.createMDRenderer()
|
||||
}
|
||||
|
||||
func (m *RankModel) handleError(msg tea.Msg) {
|
||||
err := msg.(errorMsg)
|
||||
|
||||
m.statusBar.SetContent(
|
||||
stateFormats[ErrorState][0],
|
||||
fmt.Sprintf(stateFormats[ErrorState][1], err.error),
|
||||
stateFormats[ErrorState][2],
|
||||
)
|
||||
}
|
||||
|
||||
func (m *RankModel) handleScriptExecuted(msg tea.Msg) {
|
||||
rank := new(Rank)
|
||||
jsonData := []byte(msg.(scriptExecutedMsg).result)
|
||||
|
||||
err := json.Unmarshal(jsonData, &rank)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
slices.SortFunc(rank.Scores,
|
||||
func(a, b *ParticipantScore) int {
|
||||
return cmp.Compare(b.Score, a.Score)
|
||||
})
|
||||
|
||||
m.rank = rank
|
||||
|
||||
m.updateTableContent()
|
||||
m.updateViewportContent()
|
||||
|
||||
m.state = BrowseState
|
||||
}
|
||||
|
||||
func (m *RankModel) handleState(msg tea.Msg, cmds []tea.Cmd) []tea.Cmd {
|
||||
_, cmd := m.group.Update(msg)
|
||||
|
||||
if m.state == ExecutingScriptState {
|
||||
return m.updateSpinner(msg, cmd, cmds)
|
||||
}
|
||||
|
||||
if m.state == BrowseState {
|
||||
m.updateViewportContent()
|
||||
}
|
||||
|
||||
if m.state != ErrorState {
|
||||
m.statusBar.SetContent(
|
||||
stateFormats[BrowseState][0],
|
||||
fmt.Sprintf(stateFormats[BrowseState][1], len(m.rank.Scores)),
|
||||
stateFormats[BrowseState][2],
|
||||
)
|
||||
}
|
||||
|
||||
cmds = append(cmds, cmd)
|
||||
|
||||
return cmds
|
||||
}
|
||||
|
||||
func (m *RankModel) updateSpinner(msg tea.Msg, cmd tea.Cmd, cmds []tea.Cmd) []tea.Cmd {
|
||||
m.spinner, cmd = m.spinner.Update(msg)
|
||||
|
||||
m.statusBar.SetContent(fmt.Sprintf(stateFormats[m.state][0], m.spinner.View()), stateFormats[m.state][1], stateFormats[m.state][2])
|
||||
|
||||
cmds = append(cmds, cmd)
|
||||
|
||||
return cmds
|
||||
}
|
||||
|
||||
func (m *RankModel) loadStore() tea.Cmd {
|
||||
return func() tea.Msg {
|
||||
sStore, err := file.NewDefaultSessionFileStore()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return storeLoadedMsg{sStore}
|
||||
}
|
||||
}
|
||||
|
||||
func (m *RankModel) createMDRenderer() *glamour.TermRenderer {
|
||||
renderer, err := glamour.NewTermRenderer(
|
||||
glamour.WithStandardStyle("dracula"),
|
||||
glamour.WithWordWrap(m.viewport.GetWidth()),
|
||||
)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return renderer
|
||||
}
|
||||
|
||||
// func toColoredJson(data []any) (string, error) {
|
||||
// result, err := json.MarshalIndent(data, "", " ")
|
||||
// if err != nil {
|
||||
// return "", err
|
||||
// }
|
||||
|
||||
// coloredBytes := make([]byte, 0)
|
||||
// buffer := bytes.NewBuffer(coloredBytes)
|
||||
|
||||
// err = quick.Highlight(buffer, string(result), "json", "terminal16m", "dracula")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
|
||||
// return sanitize(buffer.String()), nil
|
||||
// }
|
||||
|
||||
// func sanitize(text string) string {
|
||||
// // FIXME: The use of a standard '-' character causes rendering
|
||||
// // issues within the viewport. Further investigation is
|
||||
// // required to resolve this problem.
|
||||
// return strings.Replace(text, "-", "–", -1)
|
||||
// }
|
||||
|
||||
// func desanitize(text string) string {
|
||||
// // FIXME: The use of a standard '-' character causes rendering
|
||||
// // issues within the viewport. Further investigation is
|
||||
// // required to resolve this problem.
|
||||
// return strings.Replace(text, "–", "-", -1)
|
||||
// }
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
package rank
|
||||
|
||||
const (
|
||||
ExecutingScriptState = iota
|
||||
BrowseState
|
||||
ErrorState
|
||||
)
|
||||
|
|
@ -67,8 +67,8 @@ func runServer(cmd *cobra.Command, args []string) {
|
|||
mux.Handle("POST /login", serve.Recover(loginController))
|
||||
|
||||
mux.Handle("GET /sessions", serve.Recover(sessionsController))
|
||||
mux.Handle("GET /sessions/{uuid}/exams/{participantID}", serve.Recover(examController))
|
||||
mux.Handle("POST /sessions/{uuid}/exams/{participantID}", serve.Recover(examController))
|
||||
mux.Handle("GET /sessions/{uuid}/exams/{token}", serve.Recover(examController))
|
||||
mux.Handle("POST /sessions/{uuid}/exams/{token}", serve.Recover(examController))
|
||||
|
||||
mux.Handle("GET /public/", http.StripPrefix("/public", http.FileServer(http.Dir("public"))))
|
||||
|
||||
|
|
|
|||
|
|
@ -14,22 +14,22 @@ var ExamHandler = func(c *Controller, w http.ResponseWriter, r *http.Request) {
|
|||
panic(err)
|
||||
}
|
||||
|
||||
participantID := r.PathValue("participantID")
|
||||
participantToken := r.PathValue("token")
|
||||
|
||||
session, err := c.sStore.Read(r.PathValue("uuid"))
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
exam, ok := session.Exams[participantID]
|
||||
exam, ok := session.Exams[participantToken]
|
||||
if !ok {
|
||||
panic(errors.New("Exam not found in the store!"))
|
||||
}
|
||||
|
||||
examWithSession := struct {
|
||||
*models.Exam
|
||||
Session *models.Session
|
||||
}{exam, session}
|
||||
SessionID string
|
||||
}{exam, session.ID}
|
||||
|
||||
switch r.Method {
|
||||
|
||||
|
|
@ -49,14 +49,12 @@ var ExamHandler = func(c *Controller, w http.ResponseWriter, r *http.Request) {
|
|||
|
||||
answers := make([]*models.ParticipantAnswer, 0)
|
||||
|
||||
participant := session.Participants[participantID]
|
||||
|
||||
for quizID, values := range r.Form {
|
||||
correct := false
|
||||
|
||||
quiz := session.Quizzes[quizID]
|
||||
|
||||
for _, answerID := range values {
|
||||
log.Info(answerID)
|
||||
if quiz.Correct.ID == answerID {
|
||||
correct = true
|
||||
}
|
||||
|
|
@ -66,9 +64,8 @@ var ExamHandler = func(c *Controller, w http.ResponseWriter, r *http.Request) {
|
|||
|
||||
response, err := c.rStore.Create(
|
||||
&models.Response{
|
||||
SessionTitle: session.Title,
|
||||
Participant: participant,
|
||||
Answers: answers,
|
||||
SessionID: session.ID,
|
||||
Answers: answers,
|
||||
})
|
||||
if err != nil {
|
||||
panic(err)
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ var SessionsHandler = func(c *Controller, w http.ResponseWriter, r *http.Request
|
|||
claims := token.Claims.(jwt.MapClaims)
|
||||
|
||||
var participantSessions []struct {
|
||||
ParticipantID string
|
||||
Token string
|
||||
*models.Session
|
||||
}
|
||||
|
||||
|
|
@ -23,9 +23,9 @@ var SessionsHandler = func(c *Controller, w http.ResponseWriter, r *http.Request
|
|||
for _, exam := range session.Exams {
|
||||
if exam.Participant.Token == claims["token"] {
|
||||
s := struct {
|
||||
ParticipantID string
|
||||
Token string
|
||||
*models.Session
|
||||
}{exam.Participant.ID, session}
|
||||
}{exam.Participant.Token, session}
|
||||
participantSessions = append(participantSessions, s)
|
||||
break
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ func updateSession(cmd *cobra.Command, args []string) {
|
|||
|
||||
lipgloss.SetColorProfile(termenv.TrueColor)
|
||||
|
||||
model, err := tea.NewProgram(
|
||||
_, err = tea.NewProgram(
|
||||
session.New(path, util.ReadStdin()),
|
||||
tea.WithOutput(os.Stderr),
|
||||
).Run()
|
||||
|
|
@ -51,10 +51,4 @@ func updateSession(cmd *cobra.Command, args []string) {
|
|||
os.Exit(1)
|
||||
}
|
||||
|
||||
result := model.(*session.SessionModel)
|
||||
|
||||
if result.Result != "" {
|
||||
fmt.Fprintf(os.Stdout, result.Result)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,16 @@
|
|||
package session
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"git.andreafazzi.eu/andrea/probo/pkg/models"
|
||||
"git.andreafazzi.eu/andrea/probo/pkg/store/file"
|
||||
"github.com/alecthomas/chroma/quick"
|
||||
|
||||
"github.com/charmbracelet/bubbles/key"
|
||||
"github.com/charmbracelet/bubbles/spinner"
|
||||
|
|
@ -30,9 +33,6 @@ import (
|
|||
"github.com/remogatto/sugarfoam/layout/tiled"
|
||||
)
|
||||
|
||||
var mockSession = `
|
||||
{"participants":[{"Attributes":{"class":"Math 101A"},"created_at":"2024-04-03T09:22:11.201142494+02:00","firstname":"THOMAS","id":"1024758d-0dba-4bec-aaab-339e87a0649b","lastname":"MANN","token":"427628","updated_at":"2024-05-27T13:48:50.096492274+02:00"},{"Attributes":{"class":"Math 101A"},"created_at":"2024-04-04T10:23:12.203143495+02:00","firstname":"JAMES","id":"f3c5a7bd-6fda-4bce-bbbb-333e88a0650c","lastname":"BROWN","token":"428629","updated_at":"2024-05-27T13:48:50.075089555+02:00"},{"Attributes":{"class":"Math 101A"},"created_at":"2024-04-05T11:24:13.204144496+02:00","firstname":"LUCY","id":"g4d6c8cd-7eda-4cce-cccc-444e89a0661d","lastname":"DOE","token":"429630","updated_at":"2024-05-27T13:48:50.079134348+02:00"}], "quizzes": [{"CorrectPos":0,"answers":[{"created_at":"2024-05-27T13:55:26.448679335+02:00","id":"6771592e-4e2c-45f1-b14f-91f943a5616b","text":"3 + 1 = 1 + 3","updated_at":"2024-05-27T13:55:26.448679428+02:00"},{"created_at":"2024-05-27T13:55:26.448681412+02:00","id":"bad7db2a-f5be-4f22-879a-fd783bb1c0a9","text":"3 - 1 = 1 - 3","updated_at":"2024-05-27T13:55:26.448681456+02:00"},{"created_at":"2024-05-27T13:55:26.448683251+02:00","id":"8ae29e51-65a7-4618-8074-58ee90c4fb83","text":"3 / 2 = 2 / 3","updated_at":"2024-05-27T13:55:26.448683289+02:00"},{"created_at":"2024-05-27T13:55:26.448685048+02:00","id":"7d2a9491-338d-4274-9e62-3d2641788777","text":"-3 + 1 = -1 + 3","updated_at":"2024-05-27T13:55:26.448685085+02:00"}],"correct":{"created_at":"2024-05-27T13:55:26.448679335+02:00","id":"6771592e-4e2c-45f1-b14f-91f943a5616b","text":"3 + 1 = 1 + 3","updated_at":"2024-05-27T13:55:26.448679428+02:00"},"created_at":"2024-05-27T13:49:24.170080837+02:00","hash":"","id":"6a21d3fa-d63c-4acf-9238-551692ed74c4","question":{"created_at":"2024-05-27T13:55:26.448673273+02:00","id":"bf19c1f1-6896-4ca2-b7dc-1657adcce4cd","text":"In #mathematics, for the commutative property of addition, we have\nthat:","updated_at":"2024-05-27T13:55:26.448673633+02:00"},"tags":["#mathematics"],"type":0,"updated_at":"2024-05-27T13:55:26.448701931+02:00"},{"CorrectPos":0,"answers":[{"created_at":"2024-05-27T13:55:26.449222989+02:00","id":"37f741c2-12de-4463-b6c0-42b8b5249e7a","text":"3 * (4 + 5) = 3 * 4 + 3 * 5","updated_at":"2024-05-27T13:55:26.449223079+02:00"},{"created_at":"2024-05-27T13:55:26.44922686+02:00","id":"c60b1b81-5e16-4401-831c-d9fffba1d1eb","text":"6 * (2 - 3) = 6 * 2 + 6 * 3","updated_at":"2024-05-27T13:55:26.449226924+02:00"},{"created_at":"2024-05-27T13:55:26.449230299+02:00","id":"fb0ba30c-1e4e-41a1-9630-7f18aa24a6db","text":"7 * (8 + 2) = 7 * 8 - 7 * 2","updated_at":"2024-05-27T13:55:26.449230351+02:00"},{"created_at":"2024-05-27T13:55:26.449233993+02:00","id":"0cfd6fbb-7aac-4d35-aa17-3e62f5297c68","text":"2 * (1 + 2) = (- 2) * 1 - 4","updated_at":"2024-05-27T13:55:26.449234055+02:00"}],"correct":{"created_at":"2024-05-27T13:55:26.449222989+02:00","id":"37f741c2-12de-4463-b6c0-42b8b5249e7a","text":"3 * (4 + 5) = 3 * 4 + 3 * 5","updated_at":"2024-05-27T13:55:26.449223079+02:00"},"created_at":"2024-05-27T13:49:24.173550821+02:00","hash":"","id":"40aa188a-46c6-4f26-9a1e-4d5a028ba367","question":{"created_at":"2024-05-27T13:55:26.449216807+02:00","id":"723acb0a-5c60-4062-8615-fd3494220b4d","text":"In #mathematics, the distributive property allows us to multiply a sum\nor difference by a single number. Which statement correctly applies\nthis property?","updated_at":"2024-05-27T13:55:26.449216918+02:00"},"tags":["#mathematics"],"type":0,"updated_at":"2024-05-27T13:55:26.449281612+02:00"},{"CorrectPos":0,"answers":[{"created_at":"2024-05-27T13:55:26.449440615+02:00","id":"11be2252-45f0-44c1-a9f0-19dcdcd45b68","text":"1","updated_at":"2024-05-27T13:55:26.449440713+02:00"},{"created_at":"2024-05-27T13:55:26.449452222+02:00","id":"971fbf3b-27b1-4b67-9636-ac681056ce62","text":"0","updated_at":"2024-05-27T13:55:26.449452291+02:00"},{"created_at":"2024-05-27T13:55:26.449455664+02:00","id":"d35104b1-37f9-4312-aa21-a470650cb4dc","text":"2","updated_at":"2024-05-27T13:55:26.44945573+02:00"},{"created_at":"2024-05-27T13:55:26.449459322+02:00","id":"220077d2-1994-40ed-8d28-f39d2ebb8dcf","text":"3","updated_at":"2024-05-27T13:55:26.449459397+02:00"}],"correct":{"created_at":"2024-05-27T13:55:26.449440615+02:00","id":"11be2252-45f0-44c1-a9f0-19dcdcd45b68","text":"1","updated_at":"2024-05-27T13:55:26.449440713+02:00"},"created_at":"2024-05-27T13:49:24.175865713+02:00","hash":"","id":"f9fab318-3373-4729-a80f-b681460824e3","question":{"created_at":"2024-05-27T13:55:26.449432971+02:00","id":"af7d973a-a83c-4a18-ac36-92ab6442ef07","text":"In #mathematics, certain numbers have special properties. Identify the\nidentity element for multiplication among the options given:","updated_at":"2024-05-27T13:55:26.449433136+02:00"},"tags":["#mathematics"],"type":0,"updated_at":"2024-05-27T13:55:26.449476666+02:00"}]}`
|
||||
|
||||
type SessionModel struct {
|
||||
// UI
|
||||
form *form.Model
|
||||
|
|
@ -56,7 +56,6 @@ type SessionModel struct {
|
|||
|
||||
// json
|
||||
InputJson string
|
||||
Result string
|
||||
|
||||
// session
|
||||
session *models.Session
|
||||
|
|
@ -96,9 +95,8 @@ func New(path string, stdin string) *SessionModel {
|
|||
|
||||
viewport := viewport.New()
|
||||
|
||||
table := table.New(table.WithRelWidths(20, 10, 25, 25, 20))
|
||||
table := table.New(table.WithRelWidths(20, 30, 30, 20))
|
||||
table.Model.SetColumns([]btTable.Column{
|
||||
{Title: "UUID", Width: 20},
|
||||
{Title: "Token", Width: 20},
|
||||
{Title: "Lastname", Width: 20},
|
||||
{Title: "Firstname", Width: 20},
|
||||
|
|
@ -215,19 +213,6 @@ func (m *SessionModel) View() string {
|
|||
return m.document.View()
|
||||
}
|
||||
|
||||
func (m *SessionModel) marshalJSON() (string, error) {
|
||||
session, err := m.createSession()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
resultJson, err := json.Marshal(session)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return string(resultJson), nil
|
||||
}
|
||||
|
||||
func (m *SessionModel) executeScript() tea.Cmd {
|
||||
return func() tea.Msg {
|
||||
if m.scriptFilePath == "" {
|
||||
|
|
@ -241,22 +226,22 @@ func (m *SessionModel) executeScript() tea.Cmd {
|
|||
|
||||
script, err := os.ReadFile(m.scriptFilePath)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
return errorMsg{err}
|
||||
}
|
||||
|
||||
s := tengo.NewScript(script)
|
||||
|
||||
s.SetImports(stdlib.GetModuleMap("fmt", "json", "rand", "times"))
|
||||
s.SetImports(stdlib.GetModuleMap("fmt", "json"))
|
||||
_ = s.Add("input", m.InputJson)
|
||||
_ = s.Add("output", string(sessionJson))
|
||||
|
||||
c, err := s.Compile()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
return errorMsg{err}
|
||||
}
|
||||
|
||||
if err := c.Run(); err != nil {
|
||||
panic(err)
|
||||
return errorMsg{err}
|
||||
}
|
||||
|
||||
return scriptExecutedMsg{fmt.Sprintf("%s", c.Get("output"))}
|
||||
|
|
@ -264,15 +249,15 @@ func (m *SessionModel) executeScript() tea.Cmd {
|
|||
}
|
||||
}
|
||||
|
||||
func (m *SessionModel) createSession() (*models.Session, error) {
|
||||
func (m *SessionModel) createSession() error {
|
||||
m.session.Title = m.form.GetString("sessionTitle")
|
||||
|
||||
session, err := m.store.Storer.Create(m.session)
|
||||
_, err := m.store.Create(m.session)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return err
|
||||
}
|
||||
|
||||
return session, err
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *SessionModel) showErrorOnStatusBar(err error) {
|
||||
|
|
@ -286,10 +271,9 @@ func (m *SessionModel) showErrorOnStatusBar(err error) {
|
|||
func (m *SessionModel) updateTableContent(session *models.Session) {
|
||||
rows := make([]btTable.Row, 0)
|
||||
|
||||
for _, exam := range session.Exams {
|
||||
for token, exam := range session.Exams {
|
||||
rows = append(rows, btTable.Row{
|
||||
exam.Participant.ID,
|
||||
exam.Participant.Token,
|
||||
token,
|
||||
exam.Participant.Lastname,
|
||||
exam.Participant.Firstname,
|
||||
exam.Participant.Attributes.Get("class"),
|
||||
|
|
@ -301,35 +285,25 @@ func (m *SessionModel) updateTableContent(session *models.Session) {
|
|||
}
|
||||
|
||||
func (m *SessionModel) updateViewportContent(session *models.Session) {
|
||||
if len(m.table.Rows()) == 0 {
|
||||
panic(errors.New("Session have not exams"))
|
||||
}
|
||||
|
||||
currentUUID := m.table.SelectedRow()[0]
|
||||
currentExam := session.Exams[currentUUID]
|
||||
currentToken := m.table.SelectedRow()[0]
|
||||
currentExam := session.Exams[currentToken]
|
||||
|
||||
if currentExam == nil {
|
||||
panic("Current token is not associate to any exam!")
|
||||
}
|
||||
|
||||
// md, err := currentExam.ToMarkdown()
|
||||
// if err != nil {
|
||||
// m.showErrorOnStatusBar(err)
|
||||
// }
|
||||
md, err := currentExam.ToMarkdown()
|
||||
if err != nil {
|
||||
m.showErrorOnStatusBar(err)
|
||||
}
|
||||
|
||||
// data, err := currentExam.Marshal()
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
result, err := m.mdRenderer.Render(md)
|
||||
if err != nil {
|
||||
m.showErrorOnStatusBar(err)
|
||||
}
|
||||
|
||||
// result, err := m.mdRenderer.Render(md)
|
||||
// if err != nil {
|
||||
// m.showErrorOnStatusBar(err)
|
||||
// }
|
||||
m.viewport.SetContent(sanitize(result))
|
||||
|
||||
// m.viewport.SetContent(result)
|
||||
// m.viewport.SetContent(string(data))
|
||||
m.viewport.SetContent(mockSession)
|
||||
}
|
||||
|
||||
func (m *SessionModel) createMDRenderer() *glamour.TermRenderer {
|
||||
|
|
@ -382,7 +356,7 @@ func (m *SessionModel) handleStoreLoaded(msg tea.Msg) tea.Cmd {
|
|||
m.store = storeMsg.store
|
||||
m.lenStore = len(m.store.ReadAll())
|
||||
|
||||
return m.executeScript()
|
||||
return m.executeScript(m.scriptFilePath)
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -394,13 +368,10 @@ func (m *SessionModel) handleState(msg tea.Msg, cmds []tea.Cmd) []tea.Cmd {
|
|||
}
|
||||
|
||||
if m.form.State == huh.StateCompleted {
|
||||
var err error
|
||||
|
||||
m.Result, err = m.marshalJSON()
|
||||
err := m.createSession()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
cmds = append(cmds, tea.Quit)
|
||||
}
|
||||
|
||||
|
|
@ -450,3 +421,27 @@ func (m *SessionModel) loadStore() tea.Cmd {
|
|||
return storeLoadedMsg{sStore}
|
||||
}
|
||||
}
|
||||
|
||||
func toColoredJson(data []any) (string, error) {
|
||||
result, err := json.MarshalIndent(data, "", " ")
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
coloredBytes := make([]byte, 0)
|
||||
buffer := bytes.NewBuffer(coloredBytes)
|
||||
|
||||
err = quick.Highlight(buffer, string(result), "json", "terminal16m", "dracula")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return sanitize(buffer.String()), nil
|
||||
}
|
||||
|
||||
func sanitize(text string) string {
|
||||
// FIXME: The use of a standard '-' character causes rendering
|
||||
// issues within the viewport. Further investigation is
|
||||
// required to resolve this problem.
|
||||
return strings.Replace(text, "-", "–", -1)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
{{define "description"}}
|
||||
# Rank
|
||||
|
||||
**The `rank` command generates a ranking of results based on participant answers.**
|
||||
|
||||
With the `rank` command, it is possible to generate a ranking of
|
||||
results based on the answers provided by participants. The command
|
||||
accepts on standard input either a JSON ready for display or the
|
||||
result of a filter applied to the answers that needs to be processed
|
||||
through a `tengo` script to conform to the JSON schema.
|
||||
|
||||
## Example
|
||||
|
||||
Filtra le risposte date dai partecipanti al test "Math Test" e produce
|
||||
una classifica dei punteggi assegnando +1 punto per ogni risposta
|
||||
esatta fornita.
|
||||
|
||||
```
|
||||
probo filter responses -i data/filters/math_test.jq | probo rank -s data/scripts/score.tengo
|
||||
```
|
||||
{{end}}
|
||||
62
embed/cli/root/description.tmpl~
Normal file
62
embed/cli/root/description.tmpl~
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{{define "description"}}
|
||||
# Probo
|
||||
|
||||
`probo` is a quiz management and administration system designed for
|
||||
command line and text interface enthusiasts. `probo` aims to highlight
|
||||
themes such as privacy, interoperability, accessibility,
|
||||
decentralization, and quick usage speed.
|
||||
|
||||
`probo` organizes information in plain text files and folders so that
|
||||
data can be easily revised through version control systems. Quizzes
|
||||
can be written in Markdown format, filters use the `jq` language, exam
|
||||
sessions, participants, and their quiz answers are JSON files.
|
||||
|
||||
`probo` contains a built-in web server that allows quizzes to be
|
||||
administered to participants and their answers received.
|
||||
|
||||
`probo` is a self-contained application that can be distributed through
|
||||
a simple executable containing all necessary assets for its operation.
|
||||
|
||||
# Quickstart
|
||||
|
||||
1. Initialize the working directory
|
||||
|
||||
```
|
||||
probo init
|
||||
```
|
||||
|
||||
2. Create our first quiz.
|
||||
|
||||
```
|
||||
probo create quiz > data/quizzes/quiz_1.md
|
||||
```
|
||||
|
||||
3. Create two participants.
|
||||
|
||||
```
|
||||
probo create participant > data/participants/john.json
|
||||
probo create participant > data/participants/mary.json
|
||||
```
|
||||
|
||||
4. Filter participants and quizzes (in this case, all participants and
|
||||
all quizzes present in the store will be selected) and create an exam
|
||||
session.
|
||||
|
||||
```
|
||||
probo filter participant -f '.' | probo filter quizzes -f '.' | probo create session --name="My First Session" > data/sessions/my_session.json
|
||||
```
|
||||
|
||||
5. Run the web server to allow participants to respond.
|
||||
|
||||
```
|
||||
probo serve
|
||||
```
|
||||
|
||||
6. Share the *qrcode* generated from the previous step with the participants and wait for them to finish responding.
|
||||
|
||||
7. Explore the results.
|
||||
|
||||
```
|
||||
probo filter responses -f '.' | probo rank
|
||||
```
|
||||
{{end}}
|
||||
61
embed/embed.go~
Normal file
61
embed/embed.go~
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
package embed
|
||||
|
||||
import (
|
||||
"embed"
|
||||
"io"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
)
|
||||
|
||||
var (
|
||||
//go:embed templates/*
|
||||
Templates embed.FS
|
||||
Assets embed.FS
|
||||
//go:embed data/*
|
||||
Data embed.FS
|
||||
)
|
||||
|
||||
func CopyToWorkingDirectory(data embed.FS) error {
|
||||
currentDir, err := os.Getwd()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := fs.WalkDir(data, ".", func(path string, info fs.DirEntry, err error) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fullPath := path
|
||||
|
||||
if info.IsDir() {
|
||||
dirPath := filepath.Join(currentDir, path)
|
||||
if err := os.MkdirAll(dirPath, 0755); err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
srcFile, err := data.Open(fullPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
dstFile, err := os.Create(filepath.Join(currentDir, path))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer dstFile.Close()
|
||||
|
||||
_, err = io.Copy(dstFile, srcFile)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
@ -8,29 +8,34 @@
|
|||
</head>
|
||||
<body>
|
||||
|
||||
<nav class="navbar bg-body-tertiary">
|
||||
<div class="container">
|
||||
<a class="navbar-brand" href="#">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="30" height="24" fill="currentColor" class="bi bi-book d-inline-block align-text-top" viewBox="0 0 16 16">
|
||||
<path d="M1 2.828c.885-.37 2.154-.769 3.388-.893 1.33-.134 2.458.063 3.112.752v9.746c-.935-.53-2.12-.603-3.213-.493-1.18.12-2.37.461-3.287.811zm7.5-.141c.654-.689 1.782-.886 3.112-.752 1.234.124 2.503.523 3.388.893v9.923c-.918-.35-2.107-.692-3.287-.81-1.094-.111-2.278-.039-3.213.492zM8 1.783C7.015.936 5.587.81 4.287.94c-1.514.153-3.042.672-3.994 1.105A.5.5 0 0 0 0 2.5v11a.5.5 0 0 0 .707.455c.882-.4 2.303-.881 3.68-1.02 1.409-.142 2.59.087 3.223.877a.5.5 0 0 0 .78 0c.633-.79 1.814-1.019 3.222-.877 1.378.139 2.8.62 3.681 1.02A.5.5 0 0 0 16 13.5v-11a.5.5 0 0 0-.293-.455c-.952-.433-2.48-.952-3.994-1.105C10.413.809 8.985.936 8 1.783"/>
|
||||
</svg>
|
||||
Probo_
|
||||
</a>
|
||||
|
||||
<span class="navbar-text">
|
||||
{{.Session.Title}}
|
||||
</span>
|
||||
|
||||
<div class="text-end">
|
||||
<input type="submit" value="Salva" class="btn btn-primary me-2" form="submit-exam-form"/>
|
||||
</div>
|
||||
<header class="d-flex flex-wrap align-items-center justify-content-between py-3 border-bottom p-3 text-bg-dark border-bottom sticky-top">
|
||||
<a href="/" class="d-flex align-items-center mb-2 mb-lg-0 text-white text-decoration-none">
|
||||
<span class="fs-4 mx-2">Probo_</span>
|
||||
</a>
|
||||
|
||||
<div class="text-end">
|
||||
<input type="submit" value="Salva" class="btn btn-primary me-2" form="submit-exam-form"/>
|
||||
</div>
|
||||
</nav>
|
||||
</header>
|
||||
|
||||
<form action="/sessions/{{.Session.ID}}/exams/{{.Participant.ID}}" method="POST" id="submit-exam-form"/>
|
||||
<form action="/sessions/{{.SessionID}}/exams/{{.Participant.Token}}" method="POST" id="submit-exam-form"/>
|
||||
|
||||
{{template "content" .}}
|
||||
|
||||
<footer class="d-flex flex-wrap justify-content-between align-items-center py-3 my-4 border-top">
|
||||
<div class="col-md-4 d-flex align-items-center">
|
||||
<a href="/" class="mb-3 me-2 mb-md-0 text-body-secondary text-decoration-none lh-1">
|
||||
<svg class="bi" width="30" height="24"><use xlink:href="#bootstrap"></use></svg>
|
||||
</a>
|
||||
<span class="mb-3 mb-md-0 text-body-secondary">© 2024 Andrea Fazzi</span>
|
||||
</div>
|
||||
|
||||
<ul class="nav col-md-4 justify-content-end list-unstyled d-flex">
|
||||
<li class="ms-3"><a class="text-body-secondary" href="#"><svg class="bi" width="24" height="24"><use xlink:href="#twitter"></use></svg></a></li>
|
||||
<li class="ms-3"><a class="text-body-secondary" href="#"><svg class="bi" width="24" height="24"><use xlink:href="#instagram"></use></svg></a></li>
|
||||
<li class="ms-3"><a class="text-body-secondary" href="#"><svg class="bi" width="24" height="24"><use xlink:href="#facebook"></use></svg></a></li>
|
||||
</ul>
|
||||
</footer>
|
||||
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<h5 class="card-title">{{$session.Title}}</h5>
|
||||
<h6 class="card-subtitle mb-2 text-body-secondary">{{$session.CreatedAt}}</h6>
|
||||
<p class="card-text">{{$session.Description}}</p>
|
||||
<a href="/sessions/{{$session.ID}}/exams/{{$session.ParticipantID}}" class="btn btn-primary">Inizia!</a>
|
||||
<a href="/sessions/{{$session.ID}}/exams/{{$session.Token}}" class="btn btn-primary">Inizia!</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
3
go.mod
3
go.mod
|
|
@ -10,7 +10,6 @@ require (
|
|||
github.com/charmbracelet/huh v0.3.0
|
||||
github.com/charmbracelet/lipgloss v0.10.0
|
||||
github.com/charmbracelet/log v0.4.0
|
||||
github.com/charmbracelet/x/ansi v0.1.2
|
||||
github.com/d5/tengo/v2 v2.17.0
|
||||
github.com/gocarina/gocsv v0.0.0-20231116093920-b87c2d0e983a
|
||||
github.com/golang-jwt/jwt v3.2.2+incompatible
|
||||
|
|
@ -45,7 +44,7 @@ require (
|
|||
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||
github.com/mattn/go-localereader v0.0.1 // indirect
|
||||
github.com/mattn/go-runewidth v0.0.15 // indirect
|
||||
github.com/microcosm-cc/bluemonday v1.0.26 // indirect
|
||||
github.com/microcosm-cc/bluemonday v1.0.21 // indirect
|
||||
github.com/mitchellh/mapstructure v1.5.0 // indirect
|
||||
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
|
||||
github.com/muesli/cancelreader v0.2.2 // indirect
|
||||
|
|
|
|||
4
go.sum
4
go.sum
|
|
@ -25,8 +25,6 @@ github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMt
|
|||
github.com/charmbracelet/lipgloss v0.10.0/go.mod h1:Wig9DSfvANsxqkRsqj6x87irdy123SR4dOXlKa91ciE=
|
||||
github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM=
|
||||
github.com/charmbracelet/log v0.4.0/go.mod h1:63bXt/djrizTec0l11H20t8FDSvA4CRZJ1KH22MdptM=
|
||||
github.com/charmbracelet/x/ansi v0.1.2 h1:6+LR39uG8DE6zAmbu023YlqjJHkYXDF1z36ZwzO4xZY=
|
||||
github.com/charmbracelet/x/ansi v0.1.2/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
|
||||
github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
|
||||
github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
||||
|
|
@ -85,8 +83,6 @@ github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZ
|
|||
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||
github.com/microcosm-cc/bluemonday v1.0.21 h1:dNH3e4PSyE4vNX+KlRGHT5KrSvjeUkoNPwEORjffHJg=
|
||||
github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM=
|
||||
github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58=
|
||||
github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs=
|
||||
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
|
||||
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
|
||||
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
|
||||
|
|
|
|||
32
go.work.sum
32
go.work.sum
|
|
@ -5,9 +5,6 @@ cloud.google.com/go/firestore v1.14.0/go.mod h1:96MVaHLsEhbvkBEdZgfN+AS/GIkco1LR
|
|||
cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8=
|
||||
cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI=
|
||||
cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8=
|
||||
github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ=
|
||||
github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
|
||||
github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
|
||||
github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
|
||||
github.com/aymanbagabas/go-osc52 v1.0.3 h1:DTwqENW7X9arYimJrPeGZcV0ln14sGMt3pHZspWD+Mg=
|
||||
github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
|
||||
|
|
@ -61,57 +58,28 @@ go.etcd.io/etcd/client/v2 v2.305.10/go.mod h1:m3CKZi69HzilhVqtPDcjhSGp+kA1OmbNn0
|
|||
go.etcd.io/etcd/client/v3 v3.5.10/go.mod h1:RVeBnDz2PUEZqTpgqwAtUd8nAPf5kjyFyND7P1VkOKc=
|
||||
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
|
||||
go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||
golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
|
||||
golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
|
||||
golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||
golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
|
||||
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
|
||||
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
|
||||
golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||
golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
|
||||
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
|
||||
golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
|
||||
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
|
||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
|
||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
||||
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
|
||||
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
|
||||
google.golang.org/api v0.153.0/go.mod h1:3qNJX5eOmhiWYc67jRA/3GsDw97UFb5ivv7Y2PrriAY=
|
||||
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
|
||||
|
|
|
|||
|
|
@ -14,9 +14,8 @@ type ParticipantAnswer struct {
|
|||
type Response struct {
|
||||
Meta
|
||||
|
||||
SessionTitle string `json:"session_title"`
|
||||
Participant *Participant `json:"participant"`
|
||||
Answers []*ParticipantAnswer `json:"answers"`
|
||||
SessionID string `json:"session_id"`
|
||||
Answers []*ParticipantAnswer `json:"answers"`
|
||||
}
|
||||
|
||||
func (r *Response) String() string {
|
||||
|
|
|
|||
|
|
@ -9,13 +9,11 @@ import (
|
|||
type Session struct {
|
||||
Meta
|
||||
|
||||
Title string `json:"title"`
|
||||
Description string `json:"description"`
|
||||
|
||||
Participants map[string]*Participant `json:"participants"`
|
||||
Quizzes map[string]*Quiz `json:"quizzes"`
|
||||
Answers map[string]*Answer `json:"answers"`
|
||||
Exams map[string]*Exam `json:"exams"`
|
||||
Title string `json:"title"`
|
||||
Description string `json:"description"`
|
||||
Quizzes map[string]*Quiz `json:"quizzes"`
|
||||
Answers map[string]*Answer `json:"answers"`
|
||||
Exams map[string]*Exam `json:"exams"`
|
||||
}
|
||||
|
||||
func (s *Session) String() string {
|
||||
|
|
|
|||
|
|
@ -79,32 +79,24 @@ func DefaultIndexDirFunc[T FileStorable, K store.Storer[T]](s *FileStore[T, K])
|
|||
filename := file.Name()
|
||||
fullPath := filepath.Join(s.Dir, filename)
|
||||
|
||||
fileInfo, err := os.Stat(fullPath)
|
||||
content, err := os.ReadFile(fullPath)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
return err
|
||||
}
|
||||
|
||||
if fileInfo.Size() > 0 {
|
||||
content, err := os.ReadFile(fullPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
entity := s.CreateEntityFunc()
|
||||
|
||||
entity := s.CreateEntityFunc()
|
||||
|
||||
err = entity.Unmarshal(content)
|
||||
if err != nil {
|
||||
return fmt.Errorf("An error occurred unmarshalling %v: %v", filename, err)
|
||||
}
|
||||
|
||||
// mEntity, err := s.Create(entity, fullPath)
|
||||
mEntity, err := s.Storer.Create(entity)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
s.SetPath(mEntity, fullPath)
|
||||
err = entity.Unmarshal(content)
|
||||
if err != nil {
|
||||
return fmt.Errorf("An error occurred unmarshalling %v: %v", filename, err)
|
||||
}
|
||||
|
||||
mEntity, err := s.Create(entity, fullPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
s.SetPath(mEntity, fullPath)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ func NewParticipantFileStore(config *FileStoreConfig[*models.Participant, *store
|
|||
|
||||
pStore := new(ParticipantFileStore)
|
||||
|
||||
pStore.FileStore, err = NewFileStore(config, store.NewParticipantStore())
|
||||
pStore.FileStore, err = NewFileStore[*models.Participant, *store.ParticipantStore](config, store.NewParticipantStore())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import (
|
|||
type ResponseFileStore = FileStore[*models.Response, *store.Store[*models.Response]]
|
||||
|
||||
func NewResponseFileStore(config *FileStoreConfig[*models.Response, *store.ResponseStore]) (*ResponseFileStore, error) {
|
||||
return NewFileStore(config, store.NewStore[*models.Response]())
|
||||
return NewFileStore[*models.Response](config, store.NewStore[*models.Response]())
|
||||
}
|
||||
|
||||
func NewDefaultResponseFileStore() (*ResponseFileStore, error) {
|
||||
|
|
|
|||
|
|
@ -33,14 +33,10 @@ func (s *SessionStore) Create(session *models.Session) (*models.Session, error)
|
|||
}
|
||||
}
|
||||
|
||||
session.Participants = make(map[string]*models.Participant, 0)
|
||||
session.Quizzes = make(map[string]*models.Quiz, 0)
|
||||
session.Answers = make(map[string]*models.Answer, 0)
|
||||
|
||||
for _, exam := range session.Exams {
|
||||
|
||||
session.Participants[exam.Participant.ID] = exam.Participant
|
||||
|
||||
for _, quiz := range exam.Quizzes {
|
||||
session.Quizzes[quiz.ID] = quiz
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue