Skip to content

Commit d33effa

Browse files
opoudjisopoudjis
committed
https://github.com/nsip/sifxml2go/issues/11
1 parent 108eea0 commit d33effa

File tree

96 files changed

+18531
-1817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+18531
-1817
lines changed

‎cmd/sif_populate.go

Lines changed: 28 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -26,150 +26,57 @@ var vendorcount = flag.Int("vendorcount", 10, "Number of VendorInfo objects to g
2626
func main() {
2727
flag.Parse()
2828

29-
var err error
29+
usecases := populate.MakeUsecases{Enrolment: *enrolment, Provisioning: *provisioning, DailyAttendance: *dailyattendance, Financial: *financial, Gradebook: *gradebook, StudentAttendanceTimeList: *studentattendancetimelist, TeacherJudgement: *teacherjudgement, Timetable: *timetable, Wellbeing: *wellbeing, AGCollections: *agcollections}
30+
counts := populate.MakeUsecaseCounts{Students: *studentcount, Staff: *staffcount, Schools: *schoolcount, Vendors: *vendorcount}
31+
log.Printf("%+v", usecases)
32+
log.Printf("%+v", counts)
33+
populate.MakeUsecaseObjects(usecases, counts, false)
3034
/*
31-
students := populate.Create_StudentPersonals(100000, populate.Schooltype2Yearlevels("Pri/Sec"))
32-
err = populate.PrintXML(students[3])
35+
err = populate.PrintXML(ret.Schools)
3336
populate.Errcheck(err)
34-
35-
school := populate.Create_SchoolInfo("Pri/Sec")
36-
err = populate.PrintXML(school)
37+
err = populate.PrintXML(ret.Students)
3738
populate.Errcheck(err)
38-
schools := make([]*sifxml.SchoolInfo, 0)
39-
schools = append(schools, school)
40-
41-
sse := populate.Create_StudentSchoolEnrollments(students, school)
42-
err = populate.PrintXML(sse[3])
39+
err = populate.PrintXML(ret.Enrolments)
4340
populate.Errcheck(err)
44-
err = populate.PrintXML(students[3])
41+
err = populate.PrintXML(ret.Staff)
4542
populate.Errcheck(err)
46-
47-
staff := populate.Create_StaffPersonals(10)
48-
err = populate.PrintXML(staff[3])
43+
err = populate.PrintXML(ret.Assignments)
4944
populate.Errcheck(err)
50-
51-
sa := populate.Create_StaffAssignment(staff[3], school)
52-
err = populate.PrintXML(sa)
45+
err = populate.PrintXML(ret.TimeTables)
5346
populate.Errcheck(err)
54-
err = populate.PrintXML(staff[3])
47+
err = populate.PrintXML(ret.TimeTableSubjects)
5548
populate.Errcheck(err)
56-
57-
scp, scr := populate.Create_StudentContactPersonalAndRelationship(students)
58-
err = populate.PrintXML(scp[3])
49+
err = populate.PrintXML(ret.TimeTableCells)
5950
populate.Errcheck(err)
60-
err = populate.PrintXML(scr[3])
51+
err = populate.PrintXML(ret.TeachingGroups)
6152
populate.Errcheck(err)
62-
63-
rooms := populate.Create_RoomInfos(10, school)
64-
err = populate.PrintXML(rooms[3])
53+
err = populate.PrintXML(ret.Contacts)
6554
populate.Errcheck(err)
66-
67-
tt := populate.Create_TimeTable(school)
68-
err = populate.PrintXML(tt)
55+
err = populate.PrintXML(ret.Relationships)
6956
populate.Errcheck(err)
70-
71-
tts := populate.Create_TimeTableSubjects(school)
72-
err = populate.PrintXML(tts[3])
57+
err = populate.PrintXML(ret.Vendors)
7358
populate.Errcheck(err)
74-
75-
t := populate.Create_TeachingGroup(school, students, staff, tts[3])
76-
err = populate.PrintXML(t)
59+
err = populate.PrintXML(ret.Debtors)
7760
populate.Errcheck(err)
78-
79-
fa := populate.Create_FinancialAccount(nil, nil)
80-
err = populate.PrintXML(fa)
61+
err = populate.PrintXML(ret.ChargedLocations)
8162
populate.Errcheck(err)
82-
83-
cl := populate.Create_ChargedLocationInfo(nil, school)
84-
err = populate.PrintXML(cl)
63+
err = populate.PrintXML(ret.FinancialAccounts)
8564
populate.Errcheck(err)
86-
87-
cl2 := populate.Create_ChargedLocationInfo(cl, nil)
88-
err = populate.PrintXML(cl2)
65+
err = populate.PrintXML(ret.Terms)
8966
populate.Errcheck(err)
90-
91-
cl3 := populate.Create_ChargedLocationInfos(3, schools)
92-
err = populate.PrintXML(cl3[2])
67+
err = populate.PrintXML(ret.CalendarSummarys)
9368
populate.Errcheck(err)
94-
95-
v := populate.Create_VendorInfos(10)
96-
err = populate.PrintXML(v[3])
69+
err = populate.PrintXML(ret.CalendarDates)
9770
populate.Errcheck(err)
98-
99-
act := populate.Create_ScheduledActivity(school, tt, nil, tts[3], students, staff, make([]*sifxml.TeachingGroup, 0), rooms)
100-
err = populate.PrintXML(act)
71+
err = populate.PrintXML(ret.SessionInfos)
10172
populate.Errcheck(err)
102-
103-
ga := populate.Create_GradingAssignment(school, t, students)
104-
err = populate.PrintXML(ga)
73+
err = populate.PrintXML(ret.SchoolCourses)
10574
populate.Errcheck(err)
106-
107-
gs := populate.Create_GradingAssignmentScores(ga, school, t, students, staff[3])
108-
err = populate.PrintXML(gs[3])
75+
err = populate.PrintXML(ret.ScheduledActivities)
10976
populate.Errcheck(err)
110-
111-
debt := populate.Create_Debtors(students, staff, scp, v)
112-
err = populate.PrintXML(debt[3])
77+
err = populate.PrintXML(ret.CollectionRounds)
11378
populate.Errcheck(err)
114-
115-
cal := populate.Create_CalendarSummary(school)
116-
err = populate.PrintXML(cal)
117-
populate.Errcheck(err)
118-
119-
day := populate.Create_CalendarDates(cal, school)
120-
err = populate.PrintXML(day[3])
121-
populate.Errcheck(err)
122-
123-
cell := populate.Create_TimeTableCell("1", "1", "Teaching", school, tt, tts[3], t, rooms[3], rooms, staff[3], staff)
124-
err = populate.PrintXML(cell)
79+
err = populate.PrintXML(ret.CollectionStatuses)
12580
populate.Errcheck(err)
12681
*/
127-
log.Printf("%+v", *enrolment)
128-
ret := populate.MakeUsecaseObjects(populate.MakeUsecases{Enrolment: *enrolment, Provisioning: *provisioning, DailyAttendance: *dailyattendance, Financial: *financial, Gradebook: *gradebook, StudentAttendanceTimeList: *studentattendancetimelist, TeacherJudgement: *teacherjudgement, Timetable: *timetable, Wellbeing: *wellbeing, AGCollections: *agcollections}, populate.MakeUsecaseCounts{Students: *studentcount, Staff: *staffcount, Schools: *schoolcount, Vendors: *vendorcount})
129-
err = populate.PrintXML(ret.Schools)
130-
populate.Errcheck(err)
131-
err = populate.PrintXML(ret.Students)
132-
populate.Errcheck(err)
133-
err = populate.PrintXML(ret.Enrolments)
134-
populate.Errcheck(err)
135-
err = populate.PrintXML(ret.Staff)
136-
populate.Errcheck(err)
137-
err = populate.PrintXML(ret.Assignments)
138-
populate.Errcheck(err)
139-
err = populate.PrintXML(ret.TimeTables)
140-
populate.Errcheck(err)
141-
err = populate.PrintXML(ret.TimeTableSubjects)
142-
populate.Errcheck(err)
143-
err = populate.PrintXML(ret.TimeTableCells)
144-
populate.Errcheck(err)
145-
err = populate.PrintXML(ret.TeachingGroups)
146-
populate.Errcheck(err)
147-
err = populate.PrintXML(ret.Contacts)
148-
populate.Errcheck(err)
149-
err = populate.PrintXML(ret.Relationships)
150-
populate.Errcheck(err)
151-
err = populate.PrintXML(ret.Vendors)
152-
populate.Errcheck(err)
153-
err = populate.PrintXML(ret.Debtors)
154-
populate.Errcheck(err)
155-
err = populate.PrintXML(ret.ChargedLocations)
156-
populate.Errcheck(err)
157-
err = populate.PrintXML(ret.FinancialAccounts)
158-
populate.Errcheck(err)
159-
err = populate.PrintXML(ret.Terms)
160-
populate.Errcheck(err)
161-
err = populate.PrintXML(ret.CalendarSummarys)
162-
populate.Errcheck(err)
163-
err = populate.PrintXML(ret.CalendarDates)
164-
populate.Errcheck(err)
165-
err = populate.PrintXML(ret.SessionInfos)
166-
populate.Errcheck(err)
167-
err = populate.PrintXML(ret.SchoolCourses)
168-
populate.Errcheck(err)
169-
err = populate.PrintXML(ret.ScheduledActivities)
170-
populate.Errcheck(err)
171-
err = populate.PrintXML(ret.CollectionRounds)
172-
populate.Errcheck(err)
173-
err = populate.PrintXML(ret.CollectionStatuses)
174-
populate.Errcheck(err)
17582
}

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/nsip/sifxml2go
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/brianvoe/gofakeit/v5 v5.11.1

‎populate/base.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,16 @@ func PrintXML(record interface{}) error {
3535
}
3636

3737
// Marshal to JSON, and print to output.
38-
func PrintJSON(record interface{}) {
38+
func PrintJSON(record interface{}) error {
3939
b, err := json.Marshal(record)
4040
if err != nil {
41-
log.Fatal(err)
41+
return err
4242
}
4343
var out bytes.Buffer
44-
json.Indent(&out, b, "=", "\t")
44+
json.Indent(&out, b, " ", "\t")
4545
out.WriteTo(os.Stdout)
46+
47+
return nil
4648
}
4749

4850
func create_GUID() string {

0 commit comments

Comments
 (0)