magister 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edc3c4fe8ca4447cfddc0af720486f52df39d69a88c079b8186552aa8cbbc5a5
-  data.tar.gz: 98e0824985ff7cea6ede1524e746580b3e9e2a4027fed30dbb0e8838581a3ac8
+  metadata.gz: faf4f432a878e25770d0a9faf41d4d1691332a60ce70d0bf5d71087da14d080e
+  data.tar.gz: 7e8fdd7861269b393f96af946b4790a682a5b9661ec99ec8a0435303e95924b6
 SHA512:
-  metadata.gz: add8ff231c89d8721ab592306b00108ac74f3de61fdc66be0a5771a8a49f6f0c8c890d73b701ed8bca3257ac167586bf462ff0f05c94a034f7a19a8138117bd8
-  data.tar.gz: 61a64312eeeb3ac760722c517d2c2f88bdb1c24e1f161d6c0abc1c1a9b70555e7513d55116ab18bd6297aab2be5e504325bf71eef7db8119a357c5a897955890
+  metadata.gz: 88ebd7702f2ac21a3724b131da9b374847b6412d66b17d55a722f1c04769c56cc48b3e9e33855e1d40dc6a4b10f7462c0db7496dbe460809c53410cbbb88a981
+  data.tar.gz: fcb21e21d0dc94c815cf1b75e08a573c7ed66463e5060e244517c54ec145358c7786d21235242f40c64c292af4beb29e13387e6fb93696ad5efcbec54b9873d3

data/lib/magister/data.rb

@@ -1,7 +1,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
+require 'magister/types/class'
+require 'magister/types/grade'
 require 'date'
+require 'json'
 
 def validate_date(date)
     format = '%Y-%m-%d'
@@ -14,9 +17,23 @@ end
 module MagisterData
     def get_classes(dateFrom, dateTo)
         if validate_date(dateFrom) && validate_date(dateTo)
-            @profile.authenticatedRequest("/personen/{*id*}/afspraken?status=1&van=#{dateFrom}&tot=#{dateTo}")
+            data = @profile.authenticatedRequest("/personen/{*id*}/afspraken?status=1&van=#{dateFrom}&tot=#{dateTo}")
+            classes = Array.new
+            data["Items"].each do |classItem|
+                classes.push MagClass.new(classItem)
+            end
+            classes
         else
             puts "Invalid date, Format is yyyy-mm-dd"
         end
     end
+
+    def get_grades(count = 5, page = 0)
+        data = @profile.authenticatedRequest("/personen/{*id*}/cijfers/laatste?top=#{count}&skip=#{count * page}")
+        grades = Array.new
+        data["items"].each do |grade|
+            grades.push Grade.new(grade)
+        end
+        grades
+    end
 end

data/lib/magister/types/class.rb

@@ -0,0 +1,140 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+require "magister/types/classroom.rb"
+require "magister/types/subject.rb"
+require "magister/types/teacher.rb"
+
+# MagClass instead of Class becasue ruby got confused with class
+class MagClass
+    def initialize(rawParsed)
+        @id                 = rawParsed["Id"]
+        @classStart         = rawParsed["Start"]
+        @classEndInclusive  = rawParsed["Einde"]
+        @wholeDay           = rawParsed["DuurtHeleDag"]
+        @description        = rawParsed["Omschrijving"]
+        # I dont know why location is here when theres also classrooms
+        @location           = rawParsed["Lokatie"]
+        @content            = rawParsed["Inhoud"]
+        @remark             = rawParsed["Opmerking"]
+        @note               = rawParsed["Aantekening"]
+        @finished           = rawParsed["Afgerond"]
+        @repeatStatus       = rawParsed["HerhaalStatus"]
+        @repeat             = rawParsed["Herhaling"]
+
+        @subjects           = Array.new
+        rawParsed["Vakken"].each do |subject|
+            @subjects.push Subject.new(subject)
+        end
+
+        @teachers           = Array.new
+        rawParsed["Docenten"].each do |teacher|
+            @teachers.push Teacher.new(teacher)
+        end
+
+        @classrooms         = Array.new
+        rawParsed["Lokalen"].each do |classRoom|
+            @classrooms.push ClassRoom.new(classRoom)
+        end
+
+        @hasAttachments     = rawParsed["HeeftBijlagen"]
+        @attachments        = rawParsed["Bijlagen"]
+
+        # I dont know what these values do
+        @infoType           = rawParsed["InfoType"]         # I think what kind of content like homework/test
+        @status             = rawParsed["Status"]           # I think the status as in cancelled
+        @type               = rawParsed["Type"]
+        @subtype            = rawParsed["SubType"]
+        @isOnline           = rawParsed["IsOnlineDeelname"] # Wether there is a way to participate online?
+        @viewType           = rawParsed["WeergaveType"]
+        @assignmentId       = rawParsed["OpdrachtId"]
+        @groups             = rawParsed["Groepen"]
+    end
+
+    def inspect
+        "#<#{self.class}:0x#{object_id} @id=#{@id}, @description=#{@description}, @subjects[0]=#{@subjects[0].inspect}, @teachers[0]=#{@teachers[0].inspect}, @location=#{@location}>"
+    end
+
+    # getters
+    def id
+        @id
+    end
+    def classStart
+        @classStart
+    end
+    def startTime
+        @classStart
+    end
+    def classEndInclusive
+        @classEndInclusive
+    end
+    def endTime
+        @classEndInclusive
+    end
+    def wholeDay
+        @wholeDay
+    end
+    def description
+        @description
+    end
+    def location
+        @location
+    end
+    def content
+        @content
+    end
+    def remark
+        @remark
+    end
+    def note
+        @note
+    end
+    def finished
+        @finished
+    end
+    def repeatStatus
+        @repeatStatus
+    end
+    def repeat
+        @repeat
+    end
+    def subjects
+        @subjects
+    end
+    def teachers
+        @teachers
+    end
+    def classrooms
+        @classrooms
+    end
+    def hasAttachments
+        @hasAttachments
+    end
+    def attachments
+        @attachments
+    end
+    def infoType
+        @infoType
+    end
+    def status
+        @status
+    end
+    def type
+        @type
+    end
+    def subtype
+        @subtype
+    end
+    def usOnline
+        @isOnline
+    end
+    def viewType
+        @viewType
+    end
+    def assignmentId
+        @assignmentId
+    end
+    def groups
+        @groups
+    end
+end

data/lib/magister/types/classroom.rb

@@ -0,0 +1,14 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+class ClassRoom
+    def initialize(rawParsed)
+      @name = rawParsed["Naam"]
+    end
+
+    # singular getter
+    def name
+        @name
+    end
+end

data/lib/magister/types/grade.rb

@@ -0,0 +1,71 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+require 'json'
+
+class Grade
+    def initialize(rawParsed)
+        @id             = rawParsed["kolomId"]
+        @description    = rawParsed["omschrijving"]
+        # This is an attrocity and shouldnt exist. yet here it is.
+        @subject        = Subject.new(JSON.parse("{\"Id\": \"#{rawParsed["vak"]["code"]}\", \"Naam\": \"#{rawParsed["vak"]["omschrijving"]}\"}"))
+
+        @grade          = rawParsed["waarde"].gsub(",", ".").to_f
+        @weight         = rawParsed["weegfactor"]
+
+        @isSufficient   = rawParsed["isVoldoende"]
+        @counts         = rawParsed["teltMee"]
+        @toBeCaughtUp   = rawParsed["moetInhalen"]
+
+        @isExempt       = rawParsed["heeftVrijstelling"]
+
+        # addedOn is when the teacher added it to magister
+        # earnedOn is when the test was done, most teachers dont put this in
+        @addedOn        = rawParsed["ingevoerdOp"]
+        @earnedOn       = rawParsed["behaaldOp"]
+    end
+
+    # getters
+    def id
+        @id
+    end
+    def description
+        @description
+    end
+    def subject
+        @subject
+    end
+    def isSufficient
+        @isSufficient
+    end
+    def isInsufficient
+        !@isSufficient
+    end
+    def grade
+        @grade
+    end
+    def values
+        @grade
+    end
+    def weight
+        @weight
+    end
+    def counts
+        @counts
+    end
+    def toBeCaughtUp
+        @toBeCaughtUp
+    end
+    def isExempt
+        @isExempt
+    end
+    def exempt
+        @isExempt
+    end
+    def addedOn
+        @addedOn
+    end
+    def earnedOn
+        @earnedOn
+    end
+end

data/lib/magister/types/subject.rb

@@ -0,0 +1,18 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+class Subject
+    def initialize(rawParsed)
+        @id = rawParsed["Id"]
+        @name = rawParsed["Naam"]
+    end
+
+    # getters
+    def id
+        @id
+    end
+    def name
+        @name
+    end
+end

data/lib/magister/types/teacher.rb

@@ -0,0 +1,28 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+class Teacher
+    def initialize(rawParsed)
+        @id = rawParsed["Id"]
+        @name = rawParsed["Naam"]
+        @abrev = rawParsed["Docentcode"]
+    end
+
+    # getters
+    def id
+        @id
+    end
+    def name
+        @name
+    end
+    def abrev
+        @abrev
+    end
+    def abreviaton
+        @abrev
+    end
+    def code
+        @abrev
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magister
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Riley0122
@@ -82,6 +82,11 @@ files:
 - lib/magister/authenticator.rb
 - lib/magister/data.rb
 - lib/magister/profile.rb
+- lib/magister/types/class.rb
+- lib/magister/types/classroom.rb
+- lib/magister/types/grade.rb
+- lib/magister/types/subject.rb
+- lib/magister/types/teacher.rb
 homepage: https://github.com/riley0122/rubymag#readme
 licenses:
 - MPL-2.0