nippo_core 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8121f2f4982272539b679e12bdb9143b56a99118
-  data.tar.gz: dfc2bc990506baaae458a684aa4c8b8173e01153
+  metadata.gz: d740b3fb0e134e3bf2fc2fdfe45e78326cbc212b
+  data.tar.gz: d40f0b3012b3136e7a47d0e50f09a941e1b552ac
 SHA512:
-  metadata.gz: d33fc7a2c54be643f929c757293dfda2041bf4a918767a348359bf950218d53319d800b472d384bbcd78c51fb3b98ead831480460b5e0e269303eddc6e0aabc8
-  data.tar.gz: 636a8331474ab111b1fe8e40408258d8cbdcb1ada3950a8e0538aa45c66be50aad35785ec0bc0e881bb475ab05b72306956e6c907a98364a72a6d99c1c6d9498
+  metadata.gz: ee4336a7e4c54fb3d6b18323dbc9821f15d9d23faed43a9da3b0bfce1105e15468c998e4f8123d2f124b579febc14bcd254dc4f449dd615cfa7dacb4b5751ecc
+  data.tar.gz: 06b7dfe6c22b40c523c78831c9a440abe9a52a741003c61c0020b4bf209e53b4cc4cee25a32d851ae2ebe23060f74356a846cb4d1f3ae98776cc01800d596485

data/README.md

@@ -1,6 +1,7 @@
 # NippoCore
 This is a daily report system gem for Rails application.  
 Mount this system to yours, you can use daily report sharing system.
+You can write with markdown format.
 
 ## Usage
 

data/app/controllers/nippo_core/groups_controller.rb

@@ -52,7 +52,7 @@ module NippoCore
     end
 
     def group_params
-      params.fetch(:group, {}).permit(:name, :description)
+      params.fetch(:group, {}).permit(:name, :description, :reported_at)
     end
   end
 end

data/app/controllers/nippo_core/reports_controller.rb

@@ -43,8 +43,8 @@ module NippoCore
 
   private
     def initialize_report
-      # TODO: selectable reported_at
-      @report = @group.reports.find_by(id: params[:id]) || @group.reports.new(report_params.merge(reported_at: Date.today, user: current_user))
+      # TODO: integrate parmas[:report][:reported_at]
+      @report = @group.reports.find_by(id: params[:id]) || @group.reports.new(report_params.merge(reported_at: params.fetch(:report, {})[:reported_at] || Date.today, user: current_user))
     end
 
     def report_params

data/app/controllers/nippo_core/users_controller.rb

@@ -4,7 +4,8 @@ module NippoCore
 
     def show
       @created_groups = current_user.created_groups.order(created_at: :desc).limit(5)
-      @joined_groups = current_user.groups.order(created_at: :desc).limit(3)
+      @joined_groups = current_user.joined_groups.order(created_at: :desc).limit(5)
+      @requesting_groups = current_user.requesting_groups.order(created_at: :desc).limit(5)
     end
   end
 end

data/app/models/nippo_core/user.rb

@@ -7,7 +7,6 @@ module NippoCore
 
     has_many :created_groups, class_name: 'NippoCore::Group', foreign_key: 'creator_id', dependent: :destroy
     has_many :reports, dependent: :destroy
-    has_many :groups, through: :group_member_relations
     has_many :group_member_relations, dependent: :destroy
 
     validates :last_name, presence: true
@@ -37,5 +36,18 @@ module NippoCore
     def request_to?(group)
       group_member_relations.exists?(group_id: group.id)
     end
+
+    # TODO: implement test
+    def joined_groups
+      NippoCore::Group.joins(:group_member_relations)
+                      .where(nippo_core_group_member_relations: {user_id: id})
+                      .where.not(nippo_core_group_member_relations: {accepted_at: nil})
+    end
+
+    # TODO: implement test
+    def requesting_groups
+      NippoCore::Group.joins(:group_member_relations)
+                      .where(nippo_core_group_member_relations: {user_id: id, accepted_at: nil})
+    end
   end
 end

data/app/views/nippo_core/groups/show.slim

@@ -19,6 +19,41 @@
           - @members.each do |m|
             li.list-group-item
               = m.nickname
+    - if @group.member?(current_user)
+      section
+        h2
+          | Weekly Index
+        - week_start_day = Date.today.at_beginning_of_week.yesterday
+        table.table
+          thead
+            th.text-center
+              | メンバー
+            - 7.times do |d|
+              th.text-center*{class: week_start_day == Date.today ? 'warning' : nil}
+                = week_start_day + d
+          tbody
+            - # TODO: DRY
+            tr.info
+              td.text-center
+                = current_user.nickname
+              - 7.times do |d|
+                - report = @group.reports.find_by(user: current_user, reported_at: week_start_day + d)
+                td.text-center*{class: week_start_day + d === Date.today ? 'warning' : nil}
+                  - if report.present?
+                    = link_to '○', [@group, report]
+                  - else
+                    = link_to '×', new_group_report_path(group_id: @group.id, report: {reported_at: week_start_day + d})
+            - @group.members.where.not(id: current_user.id).each do |member|
+              tr
+                td.text-center
+                  = member.nickname
+                - 7.times do |d|
+                  - report = @group.reports.find_by(user: member, reported_at: week_start_day + d)
+                  td.text-center*{class: week_start_day + d == Date.today ? 'warning' : nil}
+                    - if report.present?
+                      = link_to '○', [@group, report]
+                    - else
+                      | ×
     section
       - if @group.member?(current_user)
         section

data/app/views/nippo_core/reports/_form.slim

@@ -1,4 +1,5 @@
 = form_for [report.group, report] do |f|
+  = f.hidden_field :reported_at
   .form-group
     = f.label :body
     = f.text_area :body, class: 'form-control'

data/app/views/nippo_core/reports/new.slim

@@ -2,7 +2,7 @@
 .panel.panel-default
   .panel-heading
     h1.panel-title
-      = Date.today
+      = @report.reported_at
       |  
       = current_user.nickname
   .panel-body

data/app/views/nippo_core/users/show.slim

@@ -34,3 +34,13 @@ section
   .btn-group
     = link_to 'more', '#', class: 'btn btn-link'
     = link_to 'join more', groups_path, class: 'btn btn-link'
+section
+  h2
+    | Groups you request to join
+  ul.list-group
+    - @requesting_groups.each do |group|
+      li.list-group-item
+        = link_to group.name, group
+  .btn-group
+    = link_to 'more', '#', class: 'btn btn-link'
+    = link_to 'join more', groups_path, class: 'btn btn-link'

data/lib/nippo_core/version.rb

@@ -1,3 +1,3 @@
 module NippoCore
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nippo_core
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Takumu Uyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails