gmuday 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ae6165b5a82c64f2ed99839435ffccccdae476e91ffb2aff3fdfdb96b8ecd12
-  data.tar.gz: ce0a1b30c5ff74d85a990fbd8850ca0318682739497f9387bb4219321495b825
+  metadata.gz: 9547655f07e1f78b01bc66e773e8379f2026bf9c905f00d47954bcbc2a09b210
+  data.tar.gz: 10c27cd72c57e9b57bf6e60976769b61b637b1583d3367989bb3dc070a5c1812
 SHA512:
-  metadata.gz: 2d07d2f4bc252cd091e03f823e1cb8e7fc677c11aeb51fe7265415843b42e4651e7271f9105095e9e21d4605a8992502f608a58551ed63d8488e0ee51a8fa829
-  data.tar.gz: d2ee1cb26ff9cb293c109d3f2a2ee7375b2db91ad64719923ecc95ac28445ebc39b80d2dbe7f1c03407f9ec8f15a68ecd01e5d512eb5e4c13a087ee73d048d63
+  metadata.gz: d9ef1c23ea110f9565495e7095ae76af364f4e3c20e0cd8b6d139098d187e56cd2adc0c0e4f0865855ea35c2cace6f060d2b0dcaadee375e88db40150feae947
+  data.tar.gz: 880dbaffabf1a24b3b995e74a33ca4ed9fd7335f0f0fe40d28c06ae84f93ed8efc95b5d4969ff410c21c57df50d767a519f0c397bfee9caf24978ef0cc5d04a8

data/lib/gmuday.rb

@@ -7,7 +7,8 @@ require 'creek'
 module GmuDay
 
    def self.parse(file, myclass, day_start, day_end)
-      today = self.getToday
+      today_r = self.getToday
+      today = today_r[0]
       creek = Creek::Book.new "#{file}"
       @sheet = creek.sheets[0]
 
@@ -41,16 +42,12 @@ module GmuDay
 
        puts "#{'节数'.rjust(28)} #{'课程'.rjust(13)} #{'班级'.rjust(34)} #{'教室'.rjust(12)}"
        lessons.each do |lesson|
-           _week_raw = "#{lesson['C']}"
-           _week = self.week(_week_raw[0].to_i)
-           _ltime = _week_raw.reverse
-           _ltime.chop!
-           ltime = _ltime.reverse
+           spl = self.weekNum("#{lesson['C']}")
            _lesson_raw = "#{lesson['F']}"
            _lesson = _lesson_raw.gsub(/\s+/, '')
            _class = "#{lesson['G']}"
            _classroom = lesson['H']
-           msg = "[ #{lesson['A']} ]   #{_week}   #{ltime.ljust(9)} #{_lesson.ljust(20, "一")} #{_class.ljust(12)} #{_classroom.ljust(16)}"
+           msg = "[ #{lesson['A']} ]   #{spl[1]}   #{spl[2].ljust(9)} #{_lesson.ljust(20, "一")} #{_class.ljust(12)} #{_classroom.ljust(16)}"
            puts classInc(hi_class, _class) ? "\033[1;32m%s\033[0m" % msg : msg
        end
    end
@@ -65,28 +62,35 @@ module GmuDay
           return false
        end
    end
-   #private :classInc
-   def self.week(str)
-      case str
-      when 1
-         return "星期一"
-      when 2
-         return "星期二"
-      when 3
-         return "星期三"
-      when 4
-         return "星期四"
-      when 5
-         return "星期五"
-      when 6
-         return "星期六"
-      when 7
-         return "星期天"
+   def self.week(i)
+         case i
+         when 1
+            return "星期一"
+         when 2
+            return "星期二"
+         when 3
+            return "星期三"
+         when 4
+            return "星期四"
+         when 5
+            return "星期五"
+         when 6
+            return "星期六"
+         when 7
+            return "星期天"
+         end
       end
+   def self.weekNum(str)
+       str0 = str.reverse
+       str1 = str0.chop!
+       wInt = str[0].to_i
+       return [wInt, self.week(wInt), str1.reverse]
    end
    def self.getToday()
       t = Time.new
-      return t.strftime("%Y-%m-%d")
+      d = t.strftime("%Y-%m-%d")
+      w = t.wday
+      return [d, w]
    end
    def self.calDay(init_day=nil, int_num)
        if init_day.is_a? NilClass
@@ -109,4 +113,98 @@ module GmuDay
        endDay = Time.local(*_end_day_arr)
        return ((endDay - startDay) / 86400).to_i
    end
+               
+   # Added
+   def self.top()
+       week = Array(0..6)
+       week.each do |w|
+          self.buildBlock(w*150, 0, 150, 50, 1, GmuDay.week(w+1), 150/3 + w*150, 50/3, 13, 2)
+       end
+
+   end
+   def self.buildBlock(rx, ry, rw, rh, ri, tc, tx, ty, ts, ti)
+       Rectangle.new(
+         x: rx, y: ry,
+         width: rw, height: rh,
+         color: 'random',
+         z: ri
+       )
+       Text.new(
+         tc,
+         x: tx, y: ty,
+         size: ts,
+         color: 'white',
+         z: ti
+       )
+   end
+   def self.getWeekCourse(_file, _whichWeek, _cl)
+       gmu_arr = self.calWeek(_whichWeek)
+       return self.parse(_file, _cl, gmu_arr[1], gmu_arr[2])
+   end
+   def self.show(file, whichWeek, cl)
+       self.top()
+       week = Array(0..6)
+       $courses = self.getWeekCourse(file, whichWeek, cl)
+       nW = 150
+       nH = 50
+       info = Array.new
+
+       $courses.each do |course|
+           ele = self.parse_week(course)
+           info << ele
+       end
+       info.each do |o|
+           ol = o[1]
+           ol.each do |l|
+               l_raw = o[2]
+               l_show = l_raw.length > 10 ? l_raw[0,10] : l_raw
+               self.buildBlock((o[0] -1)*150, l*50, 150, 50, 1, l_show.center(20), (o[0] -1)*150, 50/3 + l*50, 12, 2)
+           end
+       end
+   end
+
+   def self.calWeek(i)
+       t = Time.new
+       tWeek = t.wday
+       last = -1 * (tWeek - 1) + i * 7
+       future = 7 - tWeek + i * 7
+       return [tWeek, last, future]
+   end
+
+   def self.parse_week(course)
+       #传入一天的course data
+       #返回星期，课序，课程，地点。如1, [1,2], 课程, 地点
+       _t =  course['C']
+       lesson = course['D']
+       arr = GmuDay.weekNum(_t)
+       w = arr[0]
+       t_raw = arr[2]
+       t = self.tSplit(t_raw)
+       wh = course['H']
+       return [w, t, lesson, wh]
+   end
+   def self.tSplit(str)
+       # 传入Str，返回数组如第一第二节课(01020304)，返回[1,2]
+       str_len = str.length
+       b_num = str_len /2
+       res_t = Array.new
+       b_i = 0
+       until b_i*4+3 >= str_len do
+           l_t_str = "#{str[b_i*4+2]}#{str[b_i*4+3]}"
+           l_t = l_t_str.to_i
+           res_t << l_t/2
+           b_i += 1
+       end
+       return res_t
+   end
+  def self.fOrNot(a, b, ele)
+      arr = ele[1]
+      return true if ele.include?(a) && arr.include?(b)
+      return false
+  end
+  def self.flush(a, b, ele, m_down)
+      t_raw = m_down % 2 == 0 ? ele[3] : ele[2]
+      t_show = t_raw.length > 10 ? t_raw[0,10] : t_raw
+      self.buildBlock((a -1)*150, b*50, 150, 50, 3 + m_down, t_show.center(20), (a -1)*150, 50/3 + b*50, 12, 4 + m_down)
+   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gmuday
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Sirius2
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: creek
@@ -24,8 +24,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: ruby2d
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
 description: GMU course helper
-email: xjy37-me@outlook.com
+email: xjy37.me@outlook.com
 executables: []
 extensions: []
 extra_rdoc_files: []