commit a2979381c7801d2ac4283b99f11adc707f7676ab · julien.rbrt.fr/tangled-core

+7 -16

appview/db/punchcard.go

···

       5
       5
        
       	"fmt"

     

       6
       6
        
       	"strings"

     

       7
       7
        
       	"time"

     

       8
       8
       +
       

     

       9
       9
       +
       	"tangled.org/core/appview/models"

     

       8
       10
        
       )

     

       9
       11
        
       

     

       10
       10
       -
       type Punch struct {

     

       11
       11
       -
       	Did   string

     

       12
       12
       -
       	Date  time.Time

     

       13
       13
       -
       	Count int

     

       14
       14
       -
       }

     

       15
       15
       -
       

     

       16
       12
        
       // this adds to the existing count

     

       17
       17
       -
       func AddPunch(e Execer, punch Punch) error {

     

       13
       13
       +
       func AddPunch(e Execer, punch models.Punch) error {

     

       18
       14
        
       	_, err := e.Exec(`

     

       19
       15
        
       		insert into punchcard (did, date, count)

     

       20
       16
        
       		values (?, ?, ?)

     
···

       24
       20
        
       	return err

     

       25
       21
        
       }

     

       26
       22
        
       

     

       27
       27
       -
       type Punchcard struct {

     

       28
       28
       -
       	Total   int

     

       29
       29
       -
       	Punches []Punch

     

       30
       30
       -
       }

     

       31
       31
       -
       

     

       32
       32
       -
       func MakePunchcard(e Execer, filters ...filter) (*Punchcard, error) {

     

       33
       33
       -
       	punchcard := &Punchcard{}

     

       23
       23
       +
       func MakePunchcard(e Execer, filters ...filter) (*models.Punchcard, error) {

     

       24
       24
       +
       	punchcard := &models.Punchcard{}

     

       34
       25
        
       	now := time.Now()

     

       35
       26
        
       	startOfYear := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.UTC)

     

       36
       27
        
       	endOfYear := time.Date(now.Year(), 12, 31, 0, 0, 0, 0, time.UTC)

     

       37
       28
        
       	for d := startOfYear; d.Before(endOfYear) || d.Equal(endOfYear); d = d.AddDate(0, 0, 1) {

     

       38
       38
       -
       		punchcard.Punches = append(punchcard.Punches, Punch{

     

       29
       29
       +
       		punchcard.Punches = append(punchcard.Punches, models.Punch{

     

       39
       30
        
       			Date:  d,

     

       40
       31
        
       			Count: 0,

     

       41
       32
        
       		})

     
···

       68
       59
        
       	defer rows.Close()

     

       69
       60
        
       

     

       70
       61
        
       	for rows.Next() {

     

       71
       71
       -
       		var punch Punch

     

       62
       62
       +
       		var punch models.Punch

     

       72
       63
        
       		var date string

     

       73
       64
        
       		var count sql.NullInt64

     

       74
       65
        
       		if err := rows.Scan(&date, &count); err != nil {

+14

appview/models/punchcard.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import "time"

     

       4
       4
       +
       

     

       5
       5
       +
       type Punch struct {

     

       6
       6
       +
       	Did   string

     

       7
       7
       +
       	Date  time.Time

     

       8
       8
       +
       	Count int

     

       9
       9
       +
       }

     

       10
       10
       +
       

     

       11
       11
       +
       type Punchcard struct {

     

       12
       12
       +
       	Total   int

     

       13
       13
       +
       	Punches []Punch

     

       14
       14
       +
       }

+1 -1

appview/pages/pages.go

···

       412
       412
        
       	UserDid      string

     

       413
       413
        
       	UserHandle   string

     

       414
       414
        
       	FollowStatus models.FollowStatus

     

       415
       415
       -
       	Punchcard    *db.Punchcard

     

       415
       415
       +
       	Punchcard    *models.Punchcard

     

       416
       416
        
       	Profile      *models.Profile

     

       417
       417
        
       	Stats        ProfileStats

     

       418
       418
        
       	Active       string

+1 -1

appview/state/knotstream.go

···

       125
       125
        
       		}

     

       126
       126
        
       	}

     

       127
       127
        
       

     

       128
       128
       -
       	punch := db.Punch{

     

       128
       128
       +
       	punch := models.Punch{

     

       129
       129
        
       		Did:   record.CommitterDid,

     

       130
       130
        
       		Date:  time.Now(),

     

       131
       131
        
       		Count: count,