sakai-info 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4081d75a494513f659f2e400b39b19073941efd
-  data.tar.gz: 0fec120b870358846426bf8e5f69480992e24d0a
+  metadata.gz: 9c1c362f4848aa264774fd24bd81df00291b3065
+  data.tar.gz: 9cf242a834d446eb1ed52762d75c9fa57239ad31
 SHA512:
-  metadata.gz: b60724a90d944df64b7d89f7227ddaa21febb727b5e66bbddc9e2b088b46831bdccd9da8b8d7cbc91677606472f62bd4397126ddb944a30db669e48d785becde
-  data.tar.gz: 63a192c81853a701021356aca37956625c2dd45879d1dffbc3241cbe04a37c5e52ddb8928598e1f714f548ddee5ee16290b6e50da1621494ebc540d818d5075e
+  metadata.gz: 2cf906ddf0b795735a9cb283666b101843427b89ecad5d7b0e4d3b1c4993e72a553627d85a8ce337fe9b30846cd3c41344fa2d65b37d9fcc7874c559c0118f20
+  data.tar.gz: 28a0fc85c2a4cc78483ed8c259663aab06e4b53ae48e439c5e3b43dd553bcecfa4b7dc55fd5675d7d638cc4c8fe916e4abba31dc5b2d58e763cd55ae9a04256e

data/CHANGELOG.md

@@ -1,8 +1,17 @@
 # sakai-info Change History #
 
+### 0.5.6 ###
+
+*Released 2014-12-11*
+
+* Added submitted date and elapsed time to quiz attempt serialization
+* Added additional shortcut names for assignment and assignment-submission
+* New object types: pending-quiz-metadata, published-quiz-metadata
+* New object types: pending-quiz-authorization, published-quiz-authorization
+
 ### 0.5.5 ###
 
-*Released ????-??-??*
+*Released 2014-07-08*
 
 * New object types: calendar and calendar-event
 * Added Site.find_all

data/README.md

@@ -1,6 +1,6 @@
 # sakai-info #
 
-last updated: 2013-06-28  
+last updated: 2014-12-11  
 author: David Adams (daveadams@gmail.com)  
 github url: https://github.com/daveadams/sakai-info
 
@@ -24,7 +24,7 @@ Use `rake` to test and build the gem:
     $ rake gem:build
 
 The resulting gem will be saved to the working directory as
-`sakai-info-0.5.5.gem`.
+`sakai-info-0.5.6.gem`.
 
 Cleanup built gems using:
 

data/lib/sakai-info/cli/lookup.rb

@@ -2,7 +2,7 @@
 #   class for handling the default command line mode
 #
 # Created 2012-05-23 daveadams@gmail.com
-# Last updated 2012-10-31 daveadams@gmail.com
+# Last updated 2014-09-16 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -99,6 +99,11 @@ module SakaiInfo
       "published-quiz-access-control" => PublishedQuizAccessControl,
       "nqac" => PendingQuizAccessControl,
       "pending-quiz-access-control" => PendingQuizAccessControl,
+      "pqm" => PublishedQuizMetadata,
+      "published-quiz-metadata" => PublishedQuizMetadata,
+      "nqm" => PendingQuizMetadata,
+      "pending-quiz-metadata" => PendingQuizMetadata,
+      "qauth" => QuizAuthorization,
       "qa" => QuizAttempt,
       "quiz-attempt" => QuizAttempt,
       "qai" => QuizAttemptItem,
@@ -109,9 +114,11 @@ module SakaiInfo
       "qpool" => QuestionPool,
       "question-pool" => QuestionPool,
       "a" => Assignment,
+      "asn" => Assignment,
       "assignment" => Assignment,
       "as" => AssignmentSubmission,
       "asub" => AssignmentSubmission,
+      "asnsub" => AssignmentSubmission,
       "assignment-submission" => AssignmentSubmission,
       "forum" => Forum,
       "ft" => ForumThread,

data/lib/sakai-info/quiz.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Quiz library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2014-07-08 daveadams@gmail.com
+# Last updated 2014-12-11 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -132,6 +132,14 @@ module SakaiInfo
       @access_control ||= self.access_control_class.find(self.id)
     end
 
+    def metadata
+      @metadata ||= self.metadata_class.find_by_quiz_id(self.id)
+    end
+
+    def authorizations
+      @authorizations ||= self.authorization_class.find_by_quiz_id(self.id)
+    end
+
     def default_serialization
       result = {
         "id" => self.id,
@@ -195,6 +203,22 @@ module SakaiInfo
       }
     end
 
+    def metadata_serialization
+      {
+        "metadata" => self.metadata.collect { |m| [m.key, m.value] }.to_h
+      }
+    end
+
+    def authorizations_serialization
+      {
+        "authorizations" => self.authorizations.collect { |a| a.serialize(:quiz_summary) }
+      }
+    end
+
+    def auths_serialization
+      self.authorizations_serialization
+    end
+
     def self.all_serializations
       [
        :default,
@@ -260,6 +284,14 @@ module SakaiInfo
     def access_control_class
       PendingQuizAccessControl
     end
+
+    def metadata_class
+      PendingQuizMetadata
+    end
+
+    def authorization_class
+      PendingQuizAuthorization
+    end
   end
 
   class PublishedQuiz < Quiz
@@ -324,6 +356,14 @@ module SakaiInfo
       PublishedQuizAccessControl
     end
 
+    def metadata_class
+      PublishedQuizMetadata
+    end
+
+    def authorization_class
+      PublishedQuizAuthorization
+    end
+
     def attempt_count
       @attempt_count ||= QuizAttempt.count_by_quiz_id(self.id)
     end
@@ -728,18 +768,8 @@ module SakaiInfo
     end
   end
 
-  # class QuizItemAttachment < SakaiObject
-  # end
-
-  # class PendingQuizItemAttachment < QuizItemAttachment
-  # end
-
-  # class PublishedQuizItemAttachment < QuizItemAttachment
-  # end
-
   class QuizAttempt < SakaiObject
-    attr_reader :dbrow, :submitted_at, :total_auto_score, :status, :attempted_at
-    attr_reader :time_elapsed, :comments, :user_id, :quiz_id
+    attr_reader :dbrow, :total_auto_score, :status, :time_elapsed, :comments, :user_id, :quiz_id
 
     def self.clear_cache
       @@cache = {}
@@ -755,7 +785,7 @@ module SakaiInfo
       @quiz_id = dbrow[:publishedassessmentid]
       @total_auto_score = dbrow[:totalautoscore]
       @status = dbrow[:status]
-      @attempted_at = dbrow[:attempted_at]
+      @attempted_at = dbrow[:attemptdate]
       @time_elapsed = dbrow[:timeelapsed]
       @is_auto_submitted = dbrow[:is_auto_submitted]
       @is_late = dbrow[:islate]
@@ -821,6 +851,22 @@ module SakaiInfo
       @is_late == 1
     end
 
+    def attempted_at
+      if @attempted_at.nil?
+        nil
+      else
+        @attempted_at.strftime("%Y-%m-%d %H:%M:%S")
+      end
+    end
+
+    def submitted_at
+      if @submitted_at.nil?
+        nil
+      else
+        @submitted_at.strftime("%Y-%m-%d %H:%M:%S")
+      end
+    end
+
     # status definitions from samigo-api/src/java/org/sakaiproject/tool/assessment/data/ifc/grading/AssessmentGradingIfc.java
     ATTEMPT_STATUS = {
       "0" => "unsubmitted",
@@ -842,7 +888,9 @@ module SakaiInfo
         "user" => self.user.serialize(:summary),
         "quiz" => self.quiz.serialize(:summary),
         "item_count" => self.item_count,
+        "attempted_at" => self.attempted_at,
         "submitted_at" => self.submitted_at,
+        "time_elapsed" => self.time_elapsed,
         "is_auto_submitted" => self.auto_submitted?,
         "is_late" => self.late?,
         "status" => self.status,
@@ -1301,4 +1349,212 @@ module SakaiInfo
       @quiz ||= PublishedQuiz.find(self.id)
     end
   end
+
+  # metadata
+  class QuizMetadata < SakaiObject
+    attr_reader :id, :dbrow, :key, :value
+
+    def initialize(dbrow)
+      @dbrow = dbrow
+      @id = dbrow[:assessmentmetadataid]
+      @quiz_id = dbrow[:assessmentid]
+      @key = dbrow[:label]
+      @value = dbrow[:entry]
+    end
+
+    def default_serialization
+      {
+        "id" => self.id,
+        "quiz" => self.quiz.serialize(:summary),
+        "key" => self.key,
+        "value" => self.value,
+      }
+    end
+  end
+
+  class PendingQuizMetadata < QuizMetadata
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
+    def self.find(id)
+      id = id.to_s
+      if @@cache[id].nil?
+        row = DB.connect[:sam_assessmetadata_t].where(:assessmentmetadataid => id.to_i).first
+        if row.nil?
+          raise ObjectNotFoundException.new(PendingQuizMetadata, id)
+        end
+
+        @@cache[id] = PendingQuizMetadata.new(row)
+      end
+      @@cache[id]
+    end
+
+    def quiz
+      @quiz ||= PendingQuiz.find(@quiz_id)
+    end
+
+    def self.query_by_quiz_id(quiz_id)
+      DB.connect[:sam_assessmetadata_t].where(:assessmentid => quiz_id)
+    end
+
+    def self.count_by_quiz_id(quiz_id)
+      PendingQuizMetadata.query_by_quiz_id(quiz_id).count
+    end
+
+    def self.find_by_quiz_id(quiz_id)
+      PendingQuizMetadata.query_by_quiz_id(quiz_id).
+        all.collect { |row| PendingQuizMetadata.new(row) }
+    end
+  end
+
+  class PublishedQuizMetadata < QuizMetadata
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
+    def self.find(id)
+      id = id.to_s
+      if @@cache[id].nil?
+        row = DB.connect[:sam_publishedmetadata_t].where(:assessmentmetadataid => id.to_i).first
+        if row.nil?
+          raise ObjectNotFoundException.new(PublishedQuizMetadata, id)
+        end
+
+        @@cache[id] = PublishedQuizMetadata.new(row)
+      end
+      @@cache[id]
+    end
+
+    def quiz
+      @quiz ||= PublishedQuiz.find(@quiz_id)
+    end
+
+    def self.query_by_quiz_id(quiz_id)
+      DB.connect[:sam_publishedmetadata_t].where(:assessmentid => quiz_id)
+    end
+
+    def self.count_by_quiz_id(quiz_id)
+      PublishedQuizMetadata.query_by_quiz_id(quiz_id).count
+    end
+
+    def self.find_by_quiz_id(quiz_id)
+      PublishedQuizMetadata.query_by_quiz_id(quiz_id).
+        all.collect { |row| PublishedQuizMetadata.new(row) }
+    end
+  end
+
+  # authorization
+  class QuizAuthorization < SakaiObject
+    attr_reader :id, :dbrow, :name, :starts_at, :ends_at
+
+    include ModProps
+    created_by_key :lastmodifiedby
+    created_at_key :lastmodifieddate
+    modified_by_key :lastmodifiedby
+    modified_at_key :lastmodifieddate
+
+    def initialize(dbrow)
+      @dbrow = dbrow
+      @id = dbrow[:id]
+      @agent_id = dbrow[:agentid]
+      @name = dbrow[:functionid]
+      @quiz_id = dbrow[:qualifierid]
+      @starts_at = dbrow[:effectivedate]
+      @ends_at = dbrow[:expirationdate]
+    end
+
+    def default_serialization
+      {
+        "id" => self.id,
+        "quiz" => self.quiz.serialize(:summary),
+        "name" => self.name,
+        "agent" => @agent_id,
+      }
+    end
+
+    def quiz_summary_serialization
+      {
+        "name" => self.name,
+        "agent" => @agent_id,
+      }
+    end
+  end
+
+  class PendingQuizAuthorization < QuizAuthorization
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
+    def self.find(id)
+      id = id.to_s
+      if @@cache[id].nil?
+        row = DB.connect[:sam_authzdata_t].where(:id => id.to_i).first
+        if row.nil?
+          raise ObjectNotFoundException.new(PendingQuizAuthorization, id)
+        end
+
+        @@cache[id] = PendingQuizAuthorization.new(row)
+      end
+      @@cache[id]
+    end
+
+    def quiz
+      @quiz ||= PendingQuiz.find(@quiz_id)
+    end
+
+    def self.query_by_quiz_id(quiz_id)
+      DB.connect[:sam_authzdata_t].where(:qualifierid => quiz_id).exclude(Sequel.like(:functionid, "%_PUBLISHED_ASSESSMENT%"))
+    end
+
+    def self.count_by_quiz_id(quiz_id)
+      PendingQuizAuthorization.query_by_quiz_id(quiz_id).count
+    end
+
+    def self.find_by_quiz_id(quiz_id)
+      PendingQuizAuthorization.query_by_quiz_id(quiz_id).
+        all.collect { |row| PendingQuizAuthorization.new(row) }
+    end
+  end
+
+  class PublishedQuizAuthorization < QuizAuthorization
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
+    def self.find(id)
+      id = id.to_s
+      if @@cache[id].nil?
+        row = DB.connect[:sam_authzdata_t].where(:id => id.to_i).first
+        if row.nil?
+          raise ObjectNotFoundException.new(PublishedQuizAuthorization, id)
+        end
+
+        @@cache[id] = PublishedQuizAuthorization.new(row)
+      end
+      @@cache[id]
+    end
+
+    def quiz
+      @quiz ||= PublishedQuiz.find(@quiz_id)
+    end
+
+    def self.query_by_quiz_id(quiz_id)
+      DB.connect[:sam_authzdata_t].where(:qualifierid => quiz_id).where(Sequel.like(:functionid, "%_PUBLISHED_ASSESSMENT%"))
+    end
+
+    def self.count_by_quiz_id(quiz_id)
+      PublishedQuizAuthorization.query_by_quiz_id(quiz_id).count
+    end
+
+    def self.find_by_quiz_id(quiz_id)
+      PublishedQuizAuthorization.query_by_quiz_id(quiz_id).
+        all.collect { |row| PublishedQuizAuthorization.new(row) }
+    end
+  end
+
 end

data/lib/sakai-info/version.rb

@@ -1,3 +1,3 @@
 module SakaiInfo
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sakai-info
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - David Adams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel