Update medications_controller.rb

yakryder · Mar 7, 2020 · 18f8b58 · 18f8b58
1 parent b67b146
commit 18f8b58
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/app/controllers/medications_controller.rb b/app/controllers/medications_controller.rb
@@ -45,11 +45,24 @@ def edit
  redirect_to_medication(@medication)
  end
 
+ def add_refill(medicine)
+ if medicine.refill.nil?
+ time = Time.zone.now.strftime('%d/%m/%Y')
+ no_of_days = medicine.total / medicine.dosage
+ no_of_weeks = no_of_days / medicine.weekly_dosage.length
+ rem = no_of_days % medicine.weekly_dosage.length
+ days = 7 * no_of_weeks + rem
+ return time.to_date + days - 1
+ end
+ medicine.refill
+ end
+
  # POST /medications
  # POST /medications.json
  def create
  @medication =
  Medication.new(medication_params.merge(user_id: current_user.id))
+ @medication.refill = add_refill(@medication)
  return unless save_refill_to_google_calendar(@medication)
 
  if @medication.save

diff --git a/app/helpers/medications_form_helper.rb b/app/helpers/medications_form_helper.rb
@@ -146,7 +146,7 @@ def medication_refill
  label: t('medications.form.refill'),
  value: @medication.refill&.to_date || nil,
  info: t('medications.form.refill_hint'),
- required: true
+ required: false
  }.merge(medication_basic_props('refill'))
  end