From 216c7661be3abd00c96bf47fa3e32a2c37bd5be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Mon, 22 Apr 2024 08:54:24 +0200 Subject: [PATCH 01/16] added summer semester plan --- config.rb | 20 +++++++++++--------- summer.rb | 9 +++++++++ 2 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 summer.rb diff --git a/config.rb b/config.rb index b0c0a55..0d81858 100644 --- a/config.rb +++ b/config.rb @@ -56,12 +56,14 @@ ] # Repeating Appointments by day of week, 0 is Sunday. Nested index is a value in HOUR_LABELS. -APPOINTMENTS_BY_WDAY = [ - {}, - {}, - {}, - {}, - {}, - {}, - {}, -] +#APPOINTMENTS_BY_WDAY = [ +# {}, +# {}, +# {}, +# {}, +# {}, +# {}, +# {}, +#] + +require_relative './summer' diff --git a/summer.rb b/summer.rb new file mode 100644 index 0000000..e47c657 --- /dev/null +++ b/summer.rb @@ -0,0 +1,9 @@ +APPOINTMENTS_BY_WDAY = [ + {}, + {14 => 'ForschMedi', 15 => 'ForschMedi', 16 => 'Profrunde', 17 => 'Profrunde'}, # Monday + {}, + {10 => 'SMNF', 11 => 'SMNF', 12 => 'OSE', 13 => 'OSE', 16 => "JourFixe"}, # Wednesday + {}, + {11 => 'Diss-Sprechstunde'}, # Friday + {}, +] From c642557b67ef9cd7f2ccb60f18d717a45f58608d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Mon, 22 Apr 2024 09:22:00 +0200 Subject: [PATCH 02/16] translated ooo form (partially) --- config.rb | 5 +++-- config/locales/de.yml | 14 +++++++++++++- config/locales/en.yml | 12 ++++++++++++ one-on-one.rb | 20 +++++++++----------- planner.rb | 7 +++++-- 5 files changed, 42 insertions(+), 16 deletions(-) diff --git a/config.rb b/config.rb index 0d81858..2e836fe 100644 --- a/config.rb +++ b/config.rb @@ -19,7 +19,7 @@ condensed: { file: OSX_FONT_PATH, font: 'Futura Condensed Medium' }, } } -PAGE_SIZE = 'A4' # Could also do 'A4' +PAGE_SIZE = 'LETTER' # Could also do 'A4' # Order is top, right, bottom, left LEFT_PAGE_MARGINS = [36, 72, 36, 36] RIGHT_PAGE_MARGINS = [36, 36, 36, 72] @@ -38,11 +38,12 @@ WINTER_SEMESTER_START = 10 # October # Use these if you have sprints of a weekly interval +USE_SPRINTS = false SPRINT_EPOCH = Date.parse('2023-01-04') SPRINT_LENGTH = 14 # Names by day of week, 0 is Sunday. -OOOS_BY_WDAY = [nil, nil, ['Juan'], ['Kelly'], nil, ['Alex', 'Edna'], nil] +OOOS_BY_WDAY = [nil, nil, ['Lilian', 'Leonard'], ['Maged','Toni'], ['Hendrik','Marthe'], ['Marvin', 'Jonas'], nil] # Repeating tasks by day of week, 0 is Sunday. Nested index is the row. TASKS_BY_WDAY = [ diff --git a/config/locales/de.yml b/config/locales/de.yml index 1a4331c..32ad620 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -35,4 +35,16 @@ de: document_title: "Semesterplan" content_outline: "Inhaltsübersicht" semester_overview: "Semesterübersicht" - weekly_overview: "Wochenübersicht" \ No newline at end of file + weekly_overview: "Wochenübersicht" + + personal_notes: "Persönliches/Notizen" + personal_notes_example: "Partner, Kinder, Haustiere, Hobbies, Freunde, Vorgeschichte, etc." + their_update: "Ihr Update" + their_update_instructions: "Notizen aus ihren “10 Minuten”" + my_update: "Mein Update" + my_update_instructions: "Notizen als Vorbereitung für meine “10 Minuten”" + future: "Zukunft/Follow Up" + future_instructions: "Was kommt als nächstes?? Dinge für das nächste 1:1" + additional_notes: "Zusätzliche Notizen" + feedback: "Feedback" + questions_to_ask: "Leitfragen" \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 208e97a..41338a6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -36,3 +36,15 @@ en: content_outline: "Outline of content" semester_overview: "Semester overview" weekly_overview: "Weekly overviews" + + personal_notes: "Personal/Notes" + personal_notes_example: "Spouse, children, pets, hobbies, friends, history, etc." + their_update: "Their update" + their_update_instructions: "Notes you take from their “10 minutes”" + my_update: "My update" + my_update_instructions: "Notes you make to prepare for your “10 minutes”" + future: "Future/Follow Up" + future_instructions: "Where are they headed? Items to review at the next 1:1" + additional_notes: "Additional Notes" + feedback: "Feedback" + questions_to_ask: "Questions to ask" \ No newline at end of file diff --git a/one-on-one.rb b/one-on-one.rb index a340ac2..b5848a7 100755 --- a/one-on-one.rb +++ b/one-on-one.rb @@ -28,17 +28,17 @@ def one_on_one_page pdf, name, date pdf.text name, heading_format(align: :left) end pdf.grid([1, 0],[1, 1]).bounding_box do - pdf.text date.strftime(DATE_LONG), subheading_format(align: :left) + pdf.text I18n.l(date, format: :long), subheading_format(align: :left) end # grid([0, 2],[0, 3]).bounding_box do # text "right heading", heading_format(align: :right) # end sections(pdf, 2, body_row_count, { - 2 => "Personal/Notes: (Spouse, children, pets, hobbies, friends, history, etc.)", - 5 => "Their Update: (Notes you take from their “10 minutes”)", - 15 => "My Update: (Notes you make to prepare for your “10 minutes”)", - 24 => "Future/Follow Up: (Where are they headed? Items to review at the next 1:1)", + 2 => "#{I18n.t('personal_notes')}: (#{I18n.t('personal_notes_example')})", + 5 => "#{I18n.t('their_update')}: (#{I18n.t('their_update_instructions')})", + 15 => "#{I18n.t('my_update')}: (#{I18n.t('my_update_instructions')})", + 24 => "#{I18n.t('future')}: (#{I18n.t('future_instructions')})", }) # Back of the page @@ -48,19 +48,19 @@ def one_on_one_page pdf, name, date pdf.text name, heading_format(align: :left) end pdf.grid([1, 0],[1, 1]).bounding_box do - pdf.text date.strftime(DATE_LONG), subheading_format(align: :left) + pdf.text I18n.l(date, format: :long), subheading_format(align: :left) end question_start = 25 question_end = question_start + 4 sections(pdf, 2, question_start - 1, { - 2 => "Additional Notes:", - 20 => "Feedback:", + 2 => "#{I18n.t('additional_notes')}:", + 20 => "#{I18n.t('feedback')}:", }) pdf.grid([question_start, 0],[question_start, 3]).bounding_box do - pdf.text "Questions to Ask:", valign: :bottom, color: DARK_COLOR + pdf.text "#{I18n.t('questions_to_ask')}:", valign: :bottom, color: DARK_COLOR end pdf.grid([question_start + 1, 0],[question_end, 1]).bounding_box do pdf.text "• Tell me about what you’ve been working on.\n" + @@ -102,5 +102,3 @@ def one_on_one_page pdf, name, date } pdf.render_file FILE_NAME - - diff --git a/planner.rb b/planner.rb index 53edd49..7f8643d 100755 --- a/planner.rb +++ b/planner.rb @@ -279,8 +279,11 @@ def daily_calendar_page pdf, date week_str = I18n.t('week') day_str = I18n.t('day') left_subhed = date.strftime("#{quarter_str} #{quarter(date)} #{week_str} %W #{day_str} %j") - # right_subhed = business_days_left_in_year(date) - right_subhed = business_days_left_in_sprint(date) + if (USE_SPRINTS) + right_subhed = business_days_left_in_sprint(date) + else + right_subhed = business_days_left_in_year(date) + end pdf.grid([0, first_column],[1, 1]).bounding_box do pdf.text left_header, heading_format(align: :left) end From 93bca5499d46ab445edcb93a432c9c992c7d4332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Mon, 22 Apr 2024 09:29:15 +0200 Subject: [PATCH 03/16] prepared ooo 18n --- config/locales/de.yml | 19 +++++++++++++++++-- config/locales/en.yml | 17 ++++++++++++++++- one-on-one.rb | 30 +++++++++++++++++------------- 3 files changed, 50 insertions(+), 16 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 32ad620..958df84 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -44,7 +44,22 @@ de: my_update: "Mein Update" my_update_instructions: "Notizen als Vorbereitung für meine “10 Minuten”" future: "Zukunft/Follow Up" - future_instructions: "Was kommt als nächstes?? Dinge für das nächste 1:1" + future_instructions: "Was kommt als nächstes? Dinge für das nächste 1:1" additional_notes: "Zusätzliche Notizen" feedback: "Feedback" - questions_to_ask: "Leitfragen" \ No newline at end of file + questions_to_ask: "Leitfragen" + questions_left: | + • Tell me about what you’ve been working on. + • Tell me about your week – what’s it been like? + • Tell me about your family/weekend/activities? + • Where are you on ( ) project? + • Are you on track to meet the deadline? + • What questions do you have about the project? + • What did ( ) say about this? + questions_right: | + • Is there anything I need to do, and if so by when? + • How are you going to approach this? + • What do you think you should do? + • So, you’re going to do “( )” by “( )”, right? + • What can you/we do differently next time? + • Any ideas/suggestions/improvements? \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 41338a6..92703e1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -47,4 +47,19 @@ en: future_instructions: "Where are they headed? Items to review at the next 1:1" additional_notes: "Additional Notes" feedback: "Feedback" - questions_to_ask: "Questions to ask" \ No newline at end of file + questions_to_ask: "Questions to ask" + questions_left: | + • Tell me about what you’ve been working on. + • Tell me about your week – what’s it been like? + • Tell me about your family/weekend/activities? + • Where are you on ( ) project? + • Are you on track to meet the deadline? + • What questions do you have about the project? + • What did ( ) say about this? + questions_right: | + • Is there anything I need to do, and if so by when? + • How are you going to approach this? + • What do you think you should do? + • So, you’re going to do “( )” by “( )”, right? + • What can you/we do differently next time? + • Any ideas/suggestions/improvements? \ No newline at end of file diff --git a/one-on-one.rb b/one-on-one.rb index b5848a7..5bee1fa 100755 --- a/one-on-one.rb +++ b/one-on-one.rb @@ -63,21 +63,25 @@ def one_on_one_page pdf, name, date pdf.text "#{I18n.t('questions_to_ask')}:", valign: :bottom, color: DARK_COLOR end pdf.grid([question_start + 1, 0],[question_end, 1]).bounding_box do - pdf.text "• Tell me about what you’ve been working on.\n" + - "• Tell me about your week – what’s it been like?\n" + - "• Tell me about your family/weekend/activities?\n" + - "• Where are you on ( ) project?\n" + - "• Are you on track to meet the deadline?\n" + - "• What questions do you have about the project?\n" + - "• What did ( ) say about this?", size: 10, color: MEDIUM_COLOR + pdf.text I18n.t('questions_left'), + #"• Tell me about what you’ve been working on.\n" + + #"• Tell me about your week – what’s it been like?\n" + + #"• Tell me about your family/weekend/activities?\n" + + #"• Where are you on ( ) project?\n" + + #"• Are you on track to meet the deadline?\n" + + #"• What questions do you have about the project?\n" + + #"• What did ( ) say about this?", + size: 10, color: MEDIUM_COLOR end pdf.grid([question_start + 1, 2],[question_end, 3]).bounding_box do - pdf.text "• Is there anything I need to do, and if so by when?\n" + - "• How are you going to approach this?\n" + - "• What do you think you should do?\n" + - "• So, you’re going to do “( )” by “( )”, right?\n" + - "• What can you/we do differently next time?\n" + - "• Any ideas/suggestions/improvements?", size: 10, color: MEDIUM_COLOR + pdf.text I18n.t('questions_right'), + # "• Is there anything I need to do, and if so by when?\n" + + # "• How are you going to approach this?\n" + + # "• What do you think you should do?\n" + + # "• So, you’re going to do “( )” by “( )”, right?\n" + + # "• What can you/we do differently next time?\n" + + # "• Any ideas/suggestions/improvements?", + size: 10, color: MEDIUM_COLOR end end From 47cc84b9fdbd47a7f8bcdb1bfda927d8c2f9452a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Mon, 22 Apr 2024 12:05:13 +0200 Subject: [PATCH 04/16] changed things for DIN-A4 double sided printing --- .gitignore | 1 + one-on-one.rb | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 432ee78..dccdfe2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ one-on-one_forms.pdf time_block_pages.pdf +notes.pdf diff --git a/one-on-one.rb b/one-on-one.rb index 5bee1fa..257a528 100755 --- a/one-on-one.rb +++ b/one-on-one.rb @@ -42,7 +42,7 @@ def one_on_one_page pdf, name, date }) # Back of the page - begin_new_page pdf, :left + begin_new_page pdf, :right pdf.grid([0, 0],[1, 1]).bounding_box do pdf.text name, heading_format(align: :left) @@ -95,13 +95,18 @@ def one_on_one_page pdf, name, date pdf = init_pdf hole_punches pdf +# we add a notes page at the beginning to start on a left page +heading_left = "Notes" +notes_page pdf, heading_left +begin_new_page pdf, :left + OOOS_BY_WDAY .each_with_index .reject { |names, _| names.nil? } .flat_map { |names, wday| names.map {|name| [name, sunday.next_day(wday)] } } .sort_by { |name, date| "#{name}#{date.iso8601}" } # Sort by name or date, as you like .each_with_index { |name_and_date, index| - begin_new_page(pdf, :right) unless index.zero? + begin_new_page(pdf, :left) unless index.zero? one_on_one_page(pdf, *name_and_date) } From 47945036c0089a8e08599385614d369ae2521a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Thu, 25 Apr 2024 10:11:26 +0200 Subject: [PATCH 05/16] updated sos24 after meeting fixes --- config.rb | 16 ++++++++-------- planner.rb | 4 ++++ summer.rb | 9 +++++---- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/config.rb b/config.rb index 2e836fe..e6a8e30 100644 --- a/config.rb +++ b/config.rb @@ -43,17 +43,17 @@ SPRINT_LENGTH = 14 # Names by day of week, 0 is Sunday. -OOOS_BY_WDAY = [nil, nil, ['Lilian', 'Leonard'], ['Maged','Toni'], ['Hendrik','Marthe'], ['Marvin', 'Jonas'], nil] +OOOS_BY_WDAY = [nil, nil, ['Hendrik', 'Marvin', 'Maged', 'Marthe' ], ['Toni'], ['Leonard','Lilian'], nil, nil] # Repeating tasks by day of week, 0 is Sunday. Nested index is the row. TASKS_BY_WDAY = [ - { 0 => 'Plan meals' }, - { 0 => 'Update standup notes' }, - { 0 => 'Update standup notes' }, - { 0 => 'Update standup notes' }, - { 0 => 'Update standup notes' }, - { 0 => 'Update standup notes' }, - { 0 => 'Plan next week' }, + { 0 => 'Wochenplan' }, # Sonntag + { 0 => 'Unterschriftenmappe', 1 => 'Fragen für die Profrunde', 2 => 'ForschMedi updaten'}, # Montag + { 0 => 'Unterschriftenmappe', 1 => 'Standup-Notizen (Hendrik, Marthe, Marvin, Maged)', 2 => 'SMNF Folien'}, # Dienstag + { 0 => 'Unterschriftenmappe', 1 => 'OSE check', 2 => 'Standup-Notizen (Toni)', 3 => 'Jour-Fixe Agenda'}, # Mittwoch + { 0 => 'Unterschriftenmappe', 1 => 'Standup-Notizen (Leonard, Lilian)', 2 => 'SMNF updaten'}, # Donnerstag + { 0 => 'Unterschriftenmappe', 16 => 'Week-Shutdown'}, + { 0 => 'Sport' }, ] # Repeating Appointments by day of week, 0 is Sunday. Nested index is a value in HOUR_LABELS. diff --git a/planner.rb b/planner.rb index 7f8643d..149f777 100755 --- a/planner.rb +++ b/planner.rb @@ -314,6 +314,10 @@ def daily_calendar_page pdf, date end end end + + + + end # Horizontal lines diff --git a/summer.rb b/summer.rb index e47c657..8e6f9f1 100644 --- a/summer.rb +++ b/summer.rb @@ -1,9 +1,10 @@ APPOINTMENTS_BY_WDAY = [ {}, - {14 => 'ForschMedi', 15 => 'ForschMedi', 16 => 'Profrunde', 17 => 'Profrunde'}, # Monday - {}, - {10 => 'SMNF', 11 => 'SMNF', 12 => 'OSE', 13 => 'OSE', 16 => "JourFixe"}, # Wednesday - {}, + # Montag + {9 => 'Diss-Updates', 14 => 'ForschMedi', 15 => 'ForschMedi', 16 => 'Profrunde', 17 => 'Profrunde'}, # Monday + {13 => 'OOO Hendrik', 14 => 'OOO Marthe', 16 => 'OOO Marvin', 16.5 => 'OOO Maged'}, + {10 => 'SMNF', 11 => 'SMNF', 12 => 'OSE', 13 => 'OSE', 14 => 'OOO Toni', 16 => 'JourFixe'}, # Wednesday + {11 => 'OOO Leonard', 14 => 'Coffe Break', 15 => 'OOO Lilian'}, {11 => 'Diss-Sprechstunde'}, # Friday {}, ] From 4825873c57efd0b14ab9c669b894608896104f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Thu, 25 Apr 2024 12:24:10 +0200 Subject: [PATCH 06/16] added the excel plan for the whole semester --- WeekPlan.xlsx | Bin 0 -> 10395 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 WeekPlan.xlsx diff --git a/WeekPlan.xlsx b/WeekPlan.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..fb3ffc4edb19ca89562fed32c32f0b4d8530d61b GIT binary patch literal 10395 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 literal 0 HcmV?d00001 From 1f797705aa2bdbb61e7ed58f30f40594ef24b3d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Tue, 30 Apr 2024 10:31:01 +0200 Subject: [PATCH 07/16] added email stuff to todo lists --- config.rb | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/config.rb b/config.rb index e6a8e30..5674093 100644 --- a/config.rb +++ b/config.rb @@ -48,11 +48,36 @@ # Repeating tasks by day of week, 0 is Sunday. Nested index is the row. TASKS_BY_WDAY = [ { 0 => 'Wochenplan' }, # Sonntag - { 0 => 'Unterschriftenmappe', 1 => 'Fragen für die Profrunde', 2 => 'ForschMedi updaten'}, # Montag - { 0 => 'Unterschriftenmappe', 1 => 'Standup-Notizen (Hendrik, Marthe, Marvin, Maged)', 2 => 'SMNF Folien'}, # Dienstag - { 0 => 'Unterschriftenmappe', 1 => 'OSE check', 2 => 'Standup-Notizen (Toni)', 3 => 'Jour-Fixe Agenda'}, # Mittwoch - { 0 => 'Unterschriftenmappe', 1 => 'Standup-Notizen (Leonard, Lilian)', 2 => 'SMNF updaten'}, # Donnerstag - { 0 => 'Unterschriftenmappe', 16 => 'Week-Shutdown'}, + { 0 => 'Unterschriftenmappe', # Montag + 1 => 'Email-Triage', + 2 => 'Fragen für die Profrunde', + 3 => 'ForschMedi updaten' + 15 => 'Emails' + }, + { 0 => 'Unterschriftenmappe', # Dienstag + 1 => 'Email-Triage', + 2 => 'Standup-Notizen (Hendrik, Marthe, Marvin, Maged)', + 3 => 'SMNF Folien', + 15 => 'Emails' + }, + { 0 => 'Unterschriftenmappe', # Mittwoch + 1 => 'Email-Triage', + 2 => 'OSE check', + 3 => 'Standup-Notizen (Toni)', + 4 => 'Jour-Fixe Agenda', + 15 => 'Emails' + }, + { 0 => 'Unterschriftenmappe', # Donnerstag + 1 => 'Email-Triage', + 2 => 'Standup-Notizen (Leonard, Lilian)', + 3 => 'SMNF updaten', + 15 => 'Emails' + }, + { 0 => 'Unterschriftenmappe', # Freitag + 1 => 'Email-Triage', + 15 => 'Emails', + 16 => 'Week-Shutdown', + 17 => 'Nächste Woche drucken'}, { 0 => 'Sport' }, ] From 441a9c64c33b1657b8ab451c3c8a7e1fe58a26da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Thu, 2 May 2024 09:38:09 +0200 Subject: [PATCH 08/16] added notes.pdf to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 432ee78..dccdfe2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ one-on-one_forms.pdf time_block_pages.pdf +notes.pdf From 7fc72dc683d884244ca98fa041b6c541b6bdc6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Mon, 6 May 2024 10:14:28 +0200 Subject: [PATCH 09/16] updated my personal config --- config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.rb b/config.rb index 5674093..7217c8f 100644 --- a/config.rb +++ b/config.rb @@ -51,7 +51,7 @@ { 0 => 'Unterschriftenmappe', # Montag 1 => 'Email-Triage', 2 => 'Fragen für die Profrunde', - 3 => 'ForschMedi updaten' + 3 => 'ForschMedi updaten', 15 => 'Emails' }, { 0 => 'Unterschriftenmappe', # Dienstag From 6d6fa01313ecd65f70706a15d82b43c6174d8523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Fri, 17 May 2024 13:02:29 +0200 Subject: [PATCH 10/16] added some new appointments --- config.rb | 34 +++++++++++++++++------------- config/locales/de.yml | 49 +++++++++++++++++++++++++++++-------------- summer.rb | 6 +++--- 3 files changed, 56 insertions(+), 33 deletions(-) diff --git a/config.rb b/config.rb index 7217c8f..ab16700 100644 --- a/config.rb +++ b/config.rb @@ -49,32 +49,38 @@ TASKS_BY_WDAY = [ { 0 => 'Wochenplan' }, # Sonntag { 0 => 'Unterschriftenmappe', # Montag - 1 => 'Email-Triage', - 2 => 'Fragen für die Profrunde', - 3 => 'ForschMedi updaten', + 1 => 'Trello', + 2 => 'Email-Triage', + 3 => 'Fragen für die Profrunde', + 4 => 'ForschMedi updaten', 15 => 'Emails' }, { 0 => 'Unterschriftenmappe', # Dienstag - 1 => 'Email-Triage', - 2 => 'Standup-Notizen (Hendrik, Marthe, Marvin, Maged)', - 3 => 'SMNF Folien', + 1 => 'Trello', + 2 => 'Email-Triage', + 3 => 'Standup-Notizen (Hendrik, Marthe, Marvin, Maged)', + 4 => 'SMNF Folien', 15 => 'Emails' }, { 0 => 'Unterschriftenmappe', # Mittwoch - 1 => 'Email-Triage', - 2 => 'OSE check', - 3 => 'Standup-Notizen (Toni)', - 4 => 'Jour-Fixe Agenda', + 1 => 'Trello', + 2 => 'Email-Triage', + 3 => 'OSE check', + 4 => 'Standup-Notizen (Toni)', + 5 => 'Jour-Fixe Agenda', 15 => 'Emails' }, { 0 => 'Unterschriftenmappe', # Donnerstag - 1 => 'Email-Triage', - 2 => 'Standup-Notizen (Leonard, Lilian)', - 3 => 'SMNF updaten', + 1 => 'Trello', + 2 => 'Email-Triage', + 3 => 'Standup-Notizen (Leonard, Lilian)', + 4 => 'SMNF updaten', 15 => 'Emails' }, { 0 => 'Unterschriftenmappe', # Freitag - 1 => 'Email-Triage', + 1 => 'Trello', + 2 => 'Email-Triage', + 14 => 'Unterschriften Mappe wegsortieren', 15 => 'Emails', 16 => 'Week-Shutdown', 17 => 'Nächste Woche drucken'}, diff --git a/config/locales/de.yml b/config/locales/de.yml index 958df84..472fa17 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1,9 +1,26 @@ de: date: - day_names: [Sonntag, Montag, Dienstag, Mittwoch, Donnerstag, Freitag, Samstag] + day_names: + [Sonntag, Montag, Dienstag, Mittwoch, Donnerstag, Freitag, Samstag] abbr_day_names: [So, Mo, Di, Mi, Do, Fr, Sa] - month_names: [~, Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember] - abbr_month_names: [~, Jan, Feb, Mär, Apr, Mai, Jun, Jul, Aug, Sep, Okt, Nov, Dez] + month_names: + [ + ~, + Januar, + Februar, + März, + April, + Mai, + Juni, + Juli, + August, + September, + Oktober, + November, + Dezember, + ] + abbr_month_names: + [~, Jan, Feb, Mär, Apr, Mai, Jun, Jul, Aug, Sep, Okt, Nov, Dez] formats: default: "%d.%m.%Y" short: "%d. %b" @@ -49,17 +66,17 @@ de: feedback: "Feedback" questions_to_ask: "Leitfragen" questions_left: | - • Tell me about what you’ve been working on. - • Tell me about your week – what’s it been like? - • Tell me about your family/weekend/activities? - • Where are you on ( ) project? - • Are you on track to meet the deadline? - • What questions do you have about the project? - • What did ( ) say about this? + • An was hast Du diese Woche gearbeitet? + • Wie ist es Dir seit letzter Woche ergangen?? + • Hast Du Dich am Wochende erholen können? ? + • Wie läuft es mit Projekt ( )? + • Ist die Deadline noch zu erreichen? + • Benötigst Du irgendwelchen Input von mir dazu? + • Was hat ( ) dazu gesagt ? questions_right: | - • Is there anything I need to do, and if so by when? - • How are you going to approach this? - • What do you think you should do? - • So, you’re going to do “( )” by “( )”, right? - • What can you/we do differently next time? - • Any ideas/suggestions/improvements? \ No newline at end of file + • Gibt es etwas was ich tun muss und bis wann? + • Hast Du Dir überlegt, wie Du das angehen möchtest? + • Was glaubst Du solltest Du tun? + • Also wirst Du “( )” bis “( )” gemacht haben, richtig? + • Was kannst Du/Wir nächstes Mal anders machen? + • Hast Du Ideen/Anregungen/Verbesserungsvorschläge dazu? diff --git a/summer.rb b/summer.rb index 8e6f9f1..082ea02 100644 --- a/summer.rb +++ b/summer.rb @@ -1,10 +1,10 @@ APPOINTMENTS_BY_WDAY = [ {}, # Montag - {9 => 'Diss-Updates', 14 => 'ForschMedi', 15 => 'ForschMedi', 16 => 'Profrunde', 17 => 'Profrunde'}, # Monday - {13 => 'OOO Hendrik', 14 => 'OOO Marthe', 16 => 'OOO Marvin', 16.5 => 'OOO Maged'}, + {9 => 'Diss-Updates', 10 => 'Diss-Updates', 14 => 'ForschMedi', 15 => 'ForschMedi', 16 => 'Profrunde', 17 => 'Profrunde'}, # Monday + {10 => 'OOO Jork Milde', 12 => 'OOO Lilian', 13 => 'OOO Hendrik', 14 => 'OOO Marthe', 16 => 'OOO Marvin & Maged'}, {10 => 'SMNF', 11 => 'SMNF', 12 => 'OSE', 13 => 'OSE', 14 => 'OOO Toni', 16 => 'JourFixe'}, # Wednesday {11 => 'OOO Leonard', 14 => 'Coffe Break', 15 => 'OOO Lilian'}, - {11 => 'Diss-Sprechstunde'}, # Friday + {11 => 'Diss-Sprechstunde', 13 = 'Lehre-Prep', 16 => 'Wrapup'}, # Friday {}, ] From 4d36caeed513e226568f5708c5307d5b29f68f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Fri, 17 May 2024 13:04:16 +0200 Subject: [PATCH 11/16] fixed a bug --- summer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/summer.rb b/summer.rb index 082ea02..51adf67 100644 --- a/summer.rb +++ b/summer.rb @@ -5,6 +5,6 @@ {10 => 'OOO Jork Milde', 12 => 'OOO Lilian', 13 => 'OOO Hendrik', 14 => 'OOO Marthe', 16 => 'OOO Marvin & Maged'}, {10 => 'SMNF', 11 => 'SMNF', 12 => 'OSE', 13 => 'OSE', 14 => 'OOO Toni', 16 => 'JourFixe'}, # Wednesday {11 => 'OOO Leonard', 14 => 'Coffe Break', 15 => 'OOO Lilian'}, - {11 => 'Diss-Sprechstunde', 13 = 'Lehre-Prep', 16 => 'Wrapup'}, # Friday + {11 => 'Diss-Sprechstunde', 13 => 'Lehre-Prep', 16 => 'Wrapup'}, # Friday {}, ] From 48d37998050bff5ced26575e02e9619bbffd5e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Fri, 17 May 2024 13:09:59 +0200 Subject: [PATCH 12/16] minor config edit. --- config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.rb b/config.rb index ab16700..4b67363 100644 --- a/config.rb +++ b/config.rb @@ -43,7 +43,7 @@ SPRINT_LENGTH = 14 # Names by day of week, 0 is Sunday. -OOOS_BY_WDAY = [nil, nil, ['Hendrik', 'Marvin', 'Maged', 'Marthe' ], ['Toni'], ['Leonard','Lilian'], nil, nil] +OOOS_BY_WDAY = [nil, nil, ['Lilian', 'Hendrik', 'Marvin', 'Maged', 'Marthe' ], ['Toni'], ['Leonard'], nil, nil] # Repeating tasks by day of week, 0 is Sunday. Nested index is the row. TASKS_BY_WDAY = [ From d24a0401911ad17dbe3c75a5a8ff6d3a15dd78d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Fri, 17 May 2024 14:19:34 +0200 Subject: [PATCH 13/16] prepare to remove personal details --- config.rb | 72 +++++++++++++++-------------------------------- my_summer_plan.rb | 54 +++++++++++++++++++++++++++++++++++ summer.rb | 10 ------- 3 files changed, 77 insertions(+), 59 deletions(-) create mode 100644 my_summer_plan.rb delete mode 100644 summer.rb diff --git a/config.rb b/config.rb index afa4dc5..49a1f52 100644 --- a/config.rb +++ b/config.rb @@ -32,60 +32,34 @@ SPRINT_EPOCH = Date.parse('2023-01-04') SPRINT_LENGTH = 14 +# This is the defaul plan for a week +# Change it here or use a separate file to load it, if your week plan changes regularly + # Names by day of week, 0 is Sunday. -OOOS_BY_WDAY = [nil, nil, ['Lilian', 'Hendrik', 'Marvin', 'Maged', 'Marthe' ], ['Toni'], ['Leonard'], nil, nil] +OOOS_BY_WDAY = [nil, nil, ['Juan'], ['Kelly'], nil, ['Alex', 'Edna'], nil] + # Repeating tasks by day of week, 0 is Sunday. Nested index is the row. TASKS_BY_WDAY = [ - { 0 => 'Wochenplan' }, # Sonntag - { 0 => 'Unterschriftenmappe', # Montag - 1 => 'Trello', - 2 => 'Email-Triage', - 3 => 'Fragen für die Profrunde', - 4 => 'ForschMedi updaten', - 15 => 'Emails' - }, - { 0 => 'Unterschriftenmappe', # Dienstag - 1 => 'Trello', - 2 => 'Email-Triage', - 3 => 'Standup-Notizen (Hendrik, Marthe, Marvin, Maged)', - 4 => 'SMNF Folien', - 15 => 'Emails' - }, - { 0 => 'Unterschriftenmappe', # Mittwoch - 1 => 'Trello', - 2 => 'Email-Triage', - 3 => 'OSE check', - 4 => 'Standup-Notizen (Toni)', - 5 => 'Jour-Fixe Agenda', - 15 => 'Emails' - }, - { 0 => 'Unterschriftenmappe', # Donnerstag - 1 => 'Trello', - 2 => 'Email-Triage', - 3 => 'Standup-Notizen (Leonard, Lilian)', - 4 => 'SMNF updaten', - 15 => 'Emails' - }, - { 0 => 'Unterschriftenmappe', # Freitag - 1 => 'Trello', - 2 => 'Email-Triage', - 14 => 'Unterschriften Mappe wegsortieren', - 15 => 'Emails', - 16 => 'Week-Shutdown', - 17 => 'Nächste Woche drucken'}, - { 0 => 'Sport' }, + { 0 => 'Plan meals' }, + { 0 => 'Update standup notes' }, + { 0 => 'Update standup notes' }, + { 0 => 'Update standup notes' }, + { 0 => 'Update standup notes' }, + { 0 => 'Update standup notes' }, + { 0 => 'Plan next week' }, ] # Repeating Appointments by day of week, 0 is Sunday. Nested index is a value in HOUR_LABELS. -#APPOINTMENTS_BY_WDAY = [ -# {}, -# {}, -# {}, -# {}, -# {}, -# {}, -# {}, -#] +APPOINTMENTS_BY_WDAY = [ + {}, + {}, + {}, + {}, + {}, + {}, + {}, +] -require_relative './summer' +# Here you could load your week plan from another file +#require_relative './my_summer_plan' diff --git a/my_summer_plan.rb b/my_summer_plan.rb new file mode 100644 index 0000000..e6988c8 --- /dev/null +++ b/my_summer_plan.rb @@ -0,0 +1,54 @@ +OOOS_BY_WDAY = [nil, nil, ['Lilian', 'Hendrik', 'Marvin', 'Maged', 'Marthe' ], ['Toni'], ['Leonard'], nil, nil] + +TASKS_BY_WDAY = [ + { 0 => 'Wochenplan' }, # Sonntag + { 0 => 'Unterschriftenmappe', # Montag + 1 => 'Trello', + 2 => 'Email-Triage', + 3 => 'Fragen für die Profrunde', + 4 => 'ForschMedi updaten', + 15 => 'Emails' + }, + { 0 => 'Unterschriftenmappe', # Dienstag + 1 => 'Trello', + 2 => 'Email-Triage', + 3 => 'Standup-Notizen (Hendrik, Marthe, Marvin, Maged)', + 4 => 'SMNF Folien', + 15 => 'Emails' + }, + { 0 => 'Unterschriftenmappe', # Mittwoch + 1 => 'Trello', + 2 => 'Email-Triage', + 3 => 'OSE check', + 4 => 'Standup-Notizen (Toni)', + 5 => 'Jour-Fixe Agenda', + 15 => 'Emails' + }, + { 0 => 'Unterschriftenmappe', # Donnerstag + 1 => 'Trello', + 2 => 'Email-Triage', + 3 => 'Standup-Notizen (Leonard, Lilian)', + 4 => 'SMNF updaten', + 15 => 'Emails' + }, + { 0 => 'Unterschriftenmappe', # Freitag + 1 => 'Trello', + 2 => 'Email-Triage', + 14 => 'Unterschriften Mappe wegsortieren', + 15 => 'Emails', + 16 => 'Week-Shutdown', + 17 => 'Nächste Woche drucken'}, + { 0 => 'Sport' }, +] + + +APPOINTMENTS_BY_WDAY = [ + {}, + # Montag + {9 => 'Diss-Updates', 10 => 'Diss-Updates', 14 => 'ForschMedi', 15 => 'ForschMedi', 16 => 'Profrunde', 17 => 'Profrunde'}, # Monday + {10 => 'OOO Jork Milde', 12 => 'OOO Lilian', 13 => 'OOO Hendrik', 14 => 'OOO Marthe', 16 => 'OOO Marvin & Maged'}, + {10 => 'SMNF', 11 => 'SMNF', 12 => 'OSE', 13 => 'OSE', 14 => 'OOO Toni', 16 => 'JourFixe'}, # Wednesday + {11 => 'OOO Leonard', 14 => 'Coffe Break', 15 => 'OOO Lilian'}, + {11 => 'Diss-Sprechstunde', 13 => 'Lehre-Prep', 16 => 'Wrapup'}, # Friday + {}, +] diff --git a/summer.rb b/summer.rb deleted file mode 100644 index 51adf67..0000000 --- a/summer.rb +++ /dev/null @@ -1,10 +0,0 @@ -APPOINTMENTS_BY_WDAY = [ - {}, - # Montag - {9 => 'Diss-Updates', 10 => 'Diss-Updates', 14 => 'ForschMedi', 15 => 'ForschMedi', 16 => 'Profrunde', 17 => 'Profrunde'}, # Monday - {10 => 'OOO Jork Milde', 12 => 'OOO Lilian', 13 => 'OOO Hendrik', 14 => 'OOO Marthe', 16 => 'OOO Marvin & Maged'}, - {10 => 'SMNF', 11 => 'SMNF', 12 => 'OSE', 13 => 'OSE', 14 => 'OOO Toni', 16 => 'JourFixe'}, # Wednesday - {11 => 'OOO Leonard', 14 => 'Coffe Break', 15 => 'OOO Lilian'}, - {11 => 'Diss-Sprechstunde', 13 => 'Lehre-Prep', 16 => 'Wrapup'}, # Friday - {}, -] From a23581acf5b2b2e6931d2af348b357e7bad41772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Fri, 17 May 2024 14:33:05 +0200 Subject: [PATCH 14/16] added the repeating different plans thing --- config.rb | 2 +- config/locales/en.yml | 22 ++++++++++++++++--- my_summer_plan.rb | 49 +++++++++++++------------------------------ one-on-one.rb | 7 ++++++- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/config.rb b/config.rb index 49a1f52..9012bfb 100644 --- a/config.rb +++ b/config.rb @@ -62,4 +62,4 @@ ] # Here you could load your week plan from another file -#require_relative './my_summer_plan' +require_relative './my_summer_plan' diff --git a/config/locales/en.yml b/config/locales/en.yml index c45be87..e7781d7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2,8 +2,24 @@ en: date: day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday] abbr_day_names: [Su, Mo, Tu, We, Th, Fr, Sa] - month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December] - abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec] + month_names: + [ + ~, + January, + February, + March, + April, + May, + June, + July, + August, + September, + October, + November, + December, + ] + abbr_month_names: + [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec] formats: default: "%m/%d/%Y" short: "%b %d" @@ -66,4 +82,4 @@ en: • What do you think you should do? • So, you’re going to do “( )” by “( )”, right? • What can you/we do differently next time? - • Any ideas/suggestions/improvements? \ No newline at end of file + • Any ideas/suggestions/improvements? diff --git a/my_summer_plan.rb b/my_summer_plan.rb index e6988c8..25532d3 100644 --- a/my_summer_plan.rb +++ b/my_summer_plan.rb @@ -1,43 +1,22 @@ -OOOS_BY_WDAY = [nil, nil, ['Lilian', 'Hendrik', 'Marvin', 'Maged', 'Marthe' ], ['Toni'], ['Leonard'], nil, nil] +OOOS_BY_WDAY = [nil, nil, ['Alex', 'John', 'Marvin'], ['Tony', 'Jim'], nil, nil, nil] TASKS_BY_WDAY = [ - { 0 => 'Wochenplan' }, # Sonntag - { 0 => 'Unterschriftenmappe', # Montag - 1 => 'Trello', - 2 => 'Email-Triage', - 3 => 'Fragen für die Profrunde', - 4 => 'ForschMedi updaten', + { 0 => 'Plan your week' }, # Sunday + { 0 => 'Trello', # Monday 15 => 'Emails' }, - { 0 => 'Unterschriftenmappe', # Dienstag - 1 => 'Trello', - 2 => 'Email-Triage', - 3 => 'Standup-Notizen (Hendrik, Marthe, Marvin, Maged)', - 4 => 'SMNF Folien', + { 0 => 'Trello', # Tuesday 15 => 'Emails' }, - { 0 => 'Unterschriftenmappe', # Mittwoch - 1 => 'Trello', - 2 => 'Email-Triage', - 3 => 'OSE check', - 4 => 'Standup-Notizen (Toni)', - 5 => 'Jour-Fixe Agenda', + { 0 => 'Trello', # Wednesday + 15 => 'Emails' }, - { 0 => 'Unterschriftenmappe', # Donnerstag - 1 => 'Trello', - 2 => 'Email-Triage', - 3 => 'Standup-Notizen (Leonard, Lilian)', - 4 => 'SMNF updaten', + { 0 => 'Trello', # Thursday 15 => 'Emails' }, - { 0 => 'Unterschriftenmappe', # Freitag - 1 => 'Trello', - 2 => 'Email-Triage', - 14 => 'Unterschriften Mappe wegsortieren', - 15 => 'Emails', - 16 => 'Week-Shutdown', - 17 => 'Nächste Woche drucken'}, + { 0 => 'Trello', # Friday + 16 => 'Week-Shutdown'}, { 0 => 'Sport' }, ] @@ -45,10 +24,10 @@ APPOINTMENTS_BY_WDAY = [ {}, # Montag - {9 => 'Diss-Updates', 10 => 'Diss-Updates', 14 => 'ForschMedi', 15 => 'ForschMedi', 16 => 'Profrunde', 17 => 'Profrunde'}, # Monday - {10 => 'OOO Jork Milde', 12 => 'OOO Lilian', 13 => 'OOO Hendrik', 14 => 'OOO Marthe', 16 => 'OOO Marvin & Maged'}, - {10 => 'SMNF', 11 => 'SMNF', 12 => 'OSE', 13 => 'OSE', 14 => 'OOO Toni', 16 => 'JourFixe'}, # Wednesday - {11 => 'OOO Leonard', 14 => 'Coffe Break', 15 => 'OOO Lilian'}, - {11 => 'Diss-Sprechstunde', 13 => 'Lehre-Prep', 16 => 'Wrapup'}, # Friday + {9 => 'Plan this week', 18 => 'Gym'}, # Monday + {9 => 'Mails'}, + {}, # Wednesday + {}, + {16 => 'Weekly Wrapup'}, # Friday {}, ] diff --git a/one-on-one.rb b/one-on-one.rb index 3597072..1f78e13 100755 --- a/one-on-one.rb +++ b/one-on-one.rb @@ -104,7 +104,7 @@ def one_on_one_page pdf, name, date hole_punches pdf # we add a notes page at the beginning to start on a left page -heading_left = "Notes" +heading_left = I18n.t('notes_heading') notes_page pdf, heading_left begin_new_page pdf, :left @@ -120,6 +120,11 @@ def one_on_one_page pdf, name, date sunday = sunday.next_day(7) end +# we add a notes page at the end to end on a left page +begin_new_page pdf, :left +heading_left = I18n.t('notes_heading') +notes_page pdf, heading_left + puts "Saving to #{FILE_NAME}" pdf.render_file FILE_NAME From eef66eac347adabcf9213e7e21d6d309278860b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Fri, 17 May 2024 14:34:00 +0200 Subject: [PATCH 15/16] fixed a bug for redefining constants --- config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.rb b/config.rb index 9012bfb..49a1f52 100644 --- a/config.rb +++ b/config.rb @@ -62,4 +62,4 @@ ] # Here you could load your week plan from another file -require_relative './my_summer_plan' +#require_relative './my_summer_plan' From e01ca5af2f70301c0f6114ce0e42d69ee56194c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Calero=20Valdez?= Date: Mon, 17 Jun 2024 13:29:17 +0200 Subject: [PATCH 16/16] added config variable for side-by-side layout --- config.rb | 2 ++ one-on-one.rb | 44 +++++++++++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/config.rb b/config.rb index 49a1f52..9d1fa9c 100644 --- a/config.rb +++ b/config.rb @@ -37,6 +37,8 @@ # Names by day of week, 0 is Sunday. OOOS_BY_WDAY = [nil, nil, ['Juan'], ['Kelly'], nil, ['Alex', 'Edna'], nil] +# If you want to have your one on one pages laid out side by side, set this to true +OOOS_SIDE_BY_SIDE = false # Repeating tasks by day of week, 0 is Sunday. Nested index is the row. diff --git a/one-on-one.rb b/one-on-one.rb index 5237fad..27c7849 100755 --- a/one-on-one.rb +++ b/one-on-one.rb @@ -42,7 +42,12 @@ def one_on_one_page pdf, name, date }) # Back of the page - begin_new_page pdf, :right + if (OOOS_SIDE_BY_SIDE) + begin_new_page pdf, :right + else + begin_new_page pdf, :left + end + pdf.grid([0, 0],[1, 1]).bounding_box do pdf.text name, heading_format(align: :left) @@ -79,7 +84,11 @@ def one_on_one_page pdf, name, date pdf = init_pdf options[:weeks].times do |week| - begin_new_page(pdf, :right) unless week.zero? + if (OOOS_SIDE_BY_SIDE) + begin_new_page(pdf, :left) unless week.zero? + else + begin_new_page(pdf, :right) unless week.zero? + end monday = sunday.next_day(1) next_sunday = sunday.next_day(7) @@ -88,10 +97,14 @@ def one_on_one_page pdf, name, date #pdf = init_pdf hole_punches pdf -# we add a notes page at the beginning to start on a left page -heading_left = I18n.t('notes_heading') -notes_page pdf, heading_left -begin_new_page pdf, :left +# If you want to have your one on one pages laid out side by side, +# you need to add a blank or notes page in the beginning +## we add a notes page at the beginning to start on a left page +if OOOS_SIDE_BY_SIDE + heading_left = I18n.t('notes_heading') + notes_page pdf, heading_left + begin_new_page pdf, :left +end OOOS_BY_WDAY .each_with_index @@ -99,16 +112,25 @@ def one_on_one_page pdf, name, date .flat_map { |names, wday| names.map {|name| [name, sunday.next_day(wday)] } } .sort_by { |name, date| "#{name}#{date.iso8601}" } # Sort by name or date, as you like .each_with_index { |name_and_date, index| - begin_new_page(pdf, :left) unless index.zero? + if OOOS_SIDE_BY_SIDE + begin_new_page(pdf, :left) unless index.zero? + else + begin_new_page(pdf, :right) unless index.zero? + end one_on_one_page(pdf, *name_and_date) } sunday = sunday.next_day(7) end -# we add a notes page at the end to end on a left page -begin_new_page pdf, :left -heading_left = I18n.t('notes_heading') -notes_page pdf, heading_left + + + +# we add a notes page at the end to end on a left page, if in side by side mode +if OOOS_SIDE_BY_SIDE + begin_new_page pdf, :left + heading_left = I18n.t('notes_heading') + notes_page pdf, heading_left +end puts "Saving to #{FILE_NAME}"