Track Progress on Strategies

Gemfile.lock

@@ -504,6 +504,8 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
+    whenever (1.0.0)
+      chronic (>= 0.6.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.3.0)
@@ -558,6 +560,7 @@ DEPENDENCIES
   rails-erd (~> 1.6)
   rails-i18n (~> 6.0.0)
   rails_12factor (= 0.0.3)
+  rake (= 12.3.3)
   react_on_rails (= 11.3.0)
   resque (= 2.0.0)
   resque-scheduler (= 4.4.0)
@@ -582,6 +585,7 @@ DEPENDENCIES
   uglifier (~> 4.1.20)
   webdrivers
   webpacker (= 3.5.5)
+  whenever
 
 RUBY VERSION
    ruby 2.6.0p0

app/controllers/concerns/strategies_concern.rb

@@ -39,11 +39,20 @@ def premade_strategy
     )
   end
 
+  def create_task(strategy)
+    task = Task.find(strategy.id)
+    return unless task
+
+    task.finished = strategy.finished
+    task.title = strategy.name
+    task.save
+  end
+
   def strategy_params
     params.require(:strategy).permit(
-      :name, :description, :published_at, :draft, :comment,
-      { category: [] }, { viewers: [] }, :visible, :bookmarked,
-      perform_strategy_reminder_attributes: %i[active id]
+      :name, :description, :published_at, :draft,
+      :comment, { category: [] }, { viewers: [] }, :visible, :bookmarked,
+      :finished, perform_strategy_reminder_attributes: %i[active id]
     )
   end
 end

app/controllers/strategies_controller.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
-
 class StrategiesController < ApplicationController
   include CollectionPageSetupConcern
   include ReminderHelper
-  include StrategiesConcern
   include Shared
+  include StrategiesConcern
   include MomentsHelper
   include TagsHelper
 
@@ -94,12 +93,14 @@ def update
     end
     empty_array_for :viewers, :category
     shared_update(@strategy, strategy_params)
+    create_task(@strategy)
   end
 
   # DELETE /strategies/1
   # DELETE /strategies/1.json
   def destroy
     shared_destroy(@strategy)
+    Task.where(id: @strategy.id).destroy_all
     PerformStrategyReminder.where(strategy_id: @strategy.id).destroy_all
   end
 

app/controllers/tasks_controller.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class TasksController < ApplicationController
+  before_action :set_task
+
+  def index
+    @tasks = Task.all
+  end
+
+  private
+
+  def set_task
+    @task = Task.find(params[:id])
+  end
+
+  def task_params
+    params.require(:task).permit(:title, :description)
+  end
+end

app/controllers/todo_items_controller.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+#
+class TodoItemsController < ApplicationController
+  before_action :set_task
+
+  def create
+    @todo_item = @task.todo_items.create(todo_item_params)
+  end
+
+  private
+
+  def set_task
+    @task = TodoList.find(params[:task_id])
+  end
+
+  def todo_item_params
+    params[:todo_item].permit(:content)
+  end
+end

app/helpers/strategies_form_helper.rb

@@ -62,6 +62,15 @@ def build_strategy_comment(strategy)
     )
   end
 
+  def build_strategy_finished(strategy)
+    build_switch_input(true, strategy.finished, false)
+      .merge(
+        id: 'strategy_finished',
+        name: 'strategy[finished]',
+        label: t('strategies.form.mark_as_finished')
+      )
+  end
+
   def build_strategy_publishing(strategy)
     build_switch_input('0', !strategy.published?, '1').merge(
       id: 'strategy_publishing', name: 'publishing',
@@ -90,17 +99,15 @@ def build_switch_input(value, checked, unchecked_value)
     {
       type: 'switch', value: value,
       uncheckedValue: unchecked_value,
-      checked: checked,
-      dark: true
+      checked: checked, dark: true
     }
   end
 
   def category_checkboxes
     checkboxes = []
     @categories.each do |item|
       checkboxes.push(
-        id: item.slug,
-        label: item.name,
+        id: item.slug, label: item.name,
         value: item.id,
         checked: @strategy.categories.include?(item)
       )

app/helpers/strategies_helper.rb

@@ -34,7 +34,8 @@ def strategy_form_inputs(strategy, viewers)
      get_viewers_input(viewers, 'strategy', 'strategies', strategy),
      build_strategy_comment(strategy), build_strategy_publishing(strategy),
      build_strategy_visible(strategy),
-     Rails.env.development? ? build_strategy_bookmarked(strategy) : {},
+     build_strategy_finished(strategy),
+     build_strategy_bookmarked(strategy),
      build_strategy_reminder(strategy).merge(type: 'checkbox'),
      build_strategy_reminder_attributes(strategy)]
   end

app/helpers/tasks_helper.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module TasksHelper
+  def present_task(element)
+    {
+      name: element.title,
+      link: 'strategies/' + element.title.downcase.strip.tr(' ', '-') + '/edit',
+      date: TimeAgo.created_or_edited(element),
+      categories: slugs_hash('Followed ': element.no_of_days_followed.to_s +
+        '/' + element.total_no_of_days.to_s + ' days')
+    }
+  end
+
+  def task_props(elements)
+    elements.map { |element| present_task(element) }
+  end
+
+  private
+
+  def slugs_hash(data)
+    data.map { |total_no_of_days| { name: total_no_of_days } }
+  end
+end

app/models/strategy.rb

@@ -16,7 +16,6 @@
 #  visible      :boolean          default(TRUE)
 #  bookmarked   :boolean          default(FALSE)
 #
-
 class Strategy < ApplicationRecord
   include Viewer
   include CommonMethods
@@ -70,4 +69,19 @@ def published?
   def comments
     Comment.comments_from(self)
   end
+
+  after_save :update_tasks_table
+
+  private
+
+  def update_tasks_table
+    @task = Task.exists?(id) ? Task.find(id) : Task.new(id: id)
+    @task.title = name
+    @task.description = description
+    @task.finished = finished
+    @task.date = updated_at
+    @task.no_of_days_followed = finished ? 1 : 0
+    @task.total_no_of_days = (created_at.to_date - Time.zone.today).to_i + 1
+    @task.save
+  end
 end

app/models/task.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+#
+class Task < ApplicationRecord
+  has_many :todo_items
+end

app/models/todo_item.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+#
+class TodoItem < ApplicationRecord
+  belongs_to :task
+end

app/views/pages/home.html.erb

@@ -1,6 +1,6 @@
 <% if user_signed_in? && @stories.any? %>
-  <% title t('pages.home.stories') %>
-  <% @page_new = "New Moment" %>
+   <% title t('pages.home.stories') %>
+  <% @page_new = t('moments.new') %>
   <% page_new new_moment_path %>
 <% elsif user_signed_in? %>
   <% title t('pages.home.signed_in_empty.main_message_one', { name: current_user.name }) %>

app/views/shared/_dashboard_nav_links.html.erb

@@ -6,6 +6,7 @@
   <%= dashboard_nav_link_to(t('categories.plural'), categories_path) %>
   <%= dashboard_nav_link_to(t('moods.plural'), moods_path) %>
   <%= dashboard_nav_link_to(t('strategies.plural'), strategies_path) %>
+  <%= dashboard_nav_link_to(t('tasks.plural'), tasks_path) %>
   <%= dashboard_nav_link_to(t('medications.index.title'), medications_path) %>
   <%= dashboard_nav_link_to(t('groups.plural'), groups_path) %>
   <%= dashboard_nav_link_to(t('allies.index.title'), allies_path) %>

app/views/tasks/index.html.erb

@@ -0,0 +1,7 @@
+<% title t('tasks.plural') %>
+<%= react_component('BaseContainer', props: {
+  container: 'StoryContainer',
+  data: task_props(@tasks),
+  fetchUrl: tasks_path,
+  lastPage: true
+})%>

app/views/todo_items/_form.html.erb

@@ -0,0 +1,4 @@
+<%= form_for([@task, @task.todo_items.build]) do |f| %>
+ <%= f.text_field :content, placeholder: "New Todo" %>
+ <%= f.submit %>
+<% end %>

app/views/todo_items/_todo_item.html.erb

@@ -0,0 +1,2 @@
+<p><%= todo_item.content %></p>
+<%= link_to task_todo_item_path(@task, todo_item.id), method: :delete, data: { confirm: t('common.actions.confirm') } %>

client/yarn.lock

@@ -57,6 +57,16 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
+"@babel/generator@^7.9.0":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.4.tgz#12441e90c3b3c4159cdecf312075bf1a8ce2dbce"
+  integrity sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==
+  dependencies:
+    "@babel/types" "^7.9.0"
+    jsesc "^2.5.1"
+    lodash "^4.17.13"
+    source-map "^0.5.0"
+
 "@babel/helper-annotate-as-pure@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
@@ -281,6 +291,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
   integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
 
+"@babel/parser@^7.7.5", "@babel/parser@^7.9.0":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
+  integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
+
 "@babel/plugin-proposal-async-generator-functions@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
@@ -938,6 +953,15 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5"
+  integrity sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.9.0"
+    lodash "^4.17.13"
+    to-fast-properties "^2.0.0"
+
 "@base2/[email protected]":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.0.tgz#860ce718b0b73f4009e153541faff2cb6b85d047"
@@ -8401,6 +8425,13 @@ json5@^2.1.1, json5@^2.1.2:
   dependencies:
     minimist "^1.2.5"
 
+json5@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+  dependencies:
+    minimist "^1.2.5"
+
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"

config/locales/de.yml

@@ -171,6 +171,8 @@ de:
     not_found:
       header_message: 'Diese Seite existiert nicht'
     empty_params: 'Kann nicht leer sein'
+  tasks:
+    plural: 'Aufgaben'
   groups:
     singular: Gruppe
     plural: Gruppen
@@ -985,6 +987,7 @@ de:
       describe: 'Beschreibe deine Strategie.'
       strategies_label: >-
                      Welche Strategien helfen dir, auf diese Gedanken zu kommen?
+      mark_as_finished: 'Als fertig markieren'
       name_hint: >-
               Jegliche Aktivität, Gedankengang oder Form von Selbsthilfe, die
               dich weiterbringt

config/locales/en.yml

@@ -168,6 +168,8 @@ en:
     not_found:
       header_message: 'This page does not exist'
     empty_params: 'Can''t be blank'
+  tasks:
+    plural: Tasks
   groups:
     singular: Group
     plural: Groups
@@ -521,7 +523,7 @@ en:
                      We're always looking for ideas from everyone,
                      including <strong>mental health advocates</strong>,
                      <strong>health professionals</strong>, <strong>software
-                     developers</strong>, <strong>translators</strong>, and
+                     developers</strong>,<strong>translators</strong>, and
                      <strong>user experience designers</strong>!
                      <p class="noMarginBottom">Please %{email_link} and
                      we'll connect with you! You will be invited to
@@ -917,6 +919,7 @@ en:
     form:
       describe: 'Describe the strategy.'
       strategies_label: 'What strategies would help achieve these thoughts?'
+      mark_as_finished: 'Mark as Finished'
       name_hint: >-
               Any activity, train of thought, or form or self-care that
               helps you

config/locales/es.yml

@@ -164,6 +164,8 @@ es:
     not_found:
       header_message: 'Esta página no existe'
     empty_params: 'No puede estar en blanco'
+  tasks:
+    plural: Tareas
   groups:
     singular: Grupo
     plural: Grupos
@@ -820,6 +822,7 @@ es:
       describe: 'Describir estrategia'
       strategies_label: '¿Qué estrategias ayudarían a conseguir estos
       pensamientos?'
+      mark_as_finished: 'Marcar como terminada'
       name_hint: 'Cualquier actividad, tren de pensamiento, o forma de auto
       cuidado que te ayude'
       viewers_hint: 'Los aliados que pueden ver tu estrategia y etiquetar con

config/locales/fr.yml

@@ -171,6 +171,8 @@ fr:
     not_found:
       header_message: "Cette page n'existe pas"
     empty_params: 'Ne peut pas être vide'
+  tasks:
+    plural: Tâches
   groups:
     singular: Groupe
     plural: Groupes
@@ -962,6 +964,7 @@ fr:
       strategies_label: >-
                      Quelles stratégies aideraient à atteindre cet état
                      d''esprit ?
+      mark_as_finished: 'Marquer comme terminé'
       name_hint: >-
               Une activité, fil de pensées ou pratique de bien-être qui vous
               aide.