Code

Merge datetime fixes#617

Code

Open

gsrohde wants to merge 61 commits intodevelopPecanProject/bety:developfrom merge_datetime_fixesPecanProject/bety:merge_datetime_fixesCopy head branch name to clipboard

+1,469-225

Commits

Commits on Oct 13, 2015

• Draft changes (temporary save).

  gsrohde

  committed
  a3e0a7b

• tmp save

  gsrohde

  committed
  f72f4c2

Commits on Oct 14, 2015

• tmp save

  gsrohde

  committed
  c3edd69

Commits on Oct 16, 2015

• Draft of new display format for dates and times on View Trait pages.

  gsrohde

  committed
  29e6da6

Commits on Oct 19, 2015

• models/trait.rb:

  Show description for 5fd6284
  gsrohde

  committed
  5fd6284

• Added to $dateloc_drop and $timeloc_drop.

  gsrohde

  committed
  e30a3eb

• Added seasons to d_month dropdown.

  gsrohde

  committed
  c15c67c

• In New Trait form, changed default utc_offset to nil and eliminated LOC fields.

  gsrohde

  committed
  9bbdcd8

• Eliminated LOC display.

  gsrohde

  committed
  10407ae

• Corrected month_day time format.

  gsrohde

  committed
  efac6e9

• Lot's of changes to Trait model. Needs cleanup.

  gsrohde

  committed
  871964f

Commits on Oct 21, 2015

• Altered Trait model d_* accessors to accomodate the case where dateloc and/or timeloc are nil (such as when the Trait is new).

  gsrohde

  committed
  bae4681

• Forgot to include timeloc value 9 in t_minute's case statement.

  gsrohde

  committed
  fc0d4d0

• In Trait validation method "consistent_date_and_time_fields", use instance

  Show description for 68f460b
  gsrohde

  committed
  68f460b

• Forgot to handle dateloc value 95 in Trait accessor method d_day.

  gsrohde

  committed
  a89d5cd

Commits on Oct 26, 2015

• Removed time zone offset input element and made date/time layout roomier.

  Show description for b3e7b9c
  gsrohde

  committed
  b3e7b9c

• Added seasons to month dropdown.

  Show description for 77bc18f
  gsrohde

  committed
  77bc18f

• Removed timezone_offset getter and setter.

  Show description for c05c2d7
  gsrohde

  committed
  c05c2d7

• Tweaked display of timezone on Show page.

  Show description for 14144a0
  gsrohde

  committed
  14144a0

• Added migration to add time_zone to sites.

  gsrohde

  committed
  2dccffb

• Merge branch 'master' into GH_356-357

  gsrohde

  committed
  2daa72d

Commits on Oct 28, 2015

• Added Javascript to Trait/Edit page to make site changes adjust the timezone informatin display.

  Show description for e258e92
  gsrohde

  committed
  e258e92

Commits on Nov 4, 2015

• Added TimesOfDay constant.

  Show description for d187ad0
  gsrohde

  committed
  d187ad0

• Re-arranged code into sections and added additional comments.

  gsrohde

  committed
  9ea7a97

• Simplified code, especially the process_datetime_input method, which now simply

  Show description for e1c1718
  gsrohde

  committed
  e1c1718

Commits on Nov 5, 2015

• Updated Trait model and time_formats initializer to support time-of-day selection and display.

  gsrohde

  committed
  905dabf

• Added constants for Months, Days, Hours, and Minutes to the Trait model and make

  Show description for e655188
  gsrohde

  committed
  e655188

• Better error handling, especially: For validation errors, add to the errors hash

  Show description for 50e0383
  gsrohde

  committed
  50e0383

Commits on Nov 6, 2015

• Updated date presentation in Advanced Search results table in accordance with

  Show description for 717b93c
  gsrohde

  committed
  717b93c

• Refactored code: Moved methods from Trait and TraitsAndYieldsView classes into a shared module in an intializer.

  gsrohde

  committed
  029d5eb

Commits on Nov 10, 2015

• Converting Yields pages and Advanced Pages to the use of new date/dateloc logic.

  gsrohde

  committed
  cb5057b

• Use named constants instead of integer literals for dummy date/time values.

  gsrohde

  committed
  9cdfa32

• Fixed bug in Yield#consistent_date_and_time_fields for the case where computed_dateloc = 8 and julianyear is blank.

  gsrohde

  committed
  b8a298c

• In Yield#update, use assign_attributes instead of update_attributes since the

  Show description for f546975
  gsrohde

  committed
  f546975

Commits on Nov 11, 2015

• Changed d_day accessor methods to return nil when dateloc is 5.5.

  gsrohde

  committed
  9f90309

• Changed CSV output for traits and yields to use LOC-aware date/time values.

  Show description for 17bd764
  gsrohde

  committed
  17bd764

• Updated yield integration test to work with new date fields.

  gsrohde

  committed
  5402cbc

Commits on Nov 20, 2015

• Added a migration that defines the normative interpretation of trait dates by

  Show description for 943a1ef
  gsrohde

  committed
  943a1ef

• Added a PL/pgSQL function that defines the normative interpretation of the time

  Show description for 11da0ce
  gsrohde

  committed
  11da0ce

Commits on Jan 28, 2016

• Merge branch 'master' into GH_356-357-merged

  gsrohde

  committed
  65f930d

Commits on May 10, 2016

• Merge branch 'master' into GH_356-357

  Show description for e4b7feb
  gsrohde

  committed
  e4b7feb

Commits on Jul 20, 2016

• Merge branch 'GH_356-357' of https://github.com/PecanProject/bety into GH_356-357

  gsrohde

  committed
  0ae10ee

• Merge branch 'master' into GH_356-357

  gsrohde

  committed
  1c8d134

• Removed redundant migration and changed timestamp on another.

  gsrohde

  committed
  2844dc0

• Merge branch 'GH_356-357' of github.com:PecanProject/bety into GH_356-357

  gsrohde

  committed
  67147a7

Commits on Jul 21, 2016

• Add more testing of the Trait model.

  gsrohde

  committed
  2086b5f

• Add more tests.

  gsrohde

  committed
  9faed8b

Commits on Jul 23, 2016

• Added more trait date tests.

  gsrohde

  committed
  6f5db31

• When computing time and date LOC, use accessors to get the year, month, day, hour, and minute instead of using instance variables so that unspecified values default to those gleaned from the 'date'…

  Show description for 848f6b6
  gsrohde

  committed
  848f6b6

• Tweaked one trait fixture and added one new one.

  gsrohde

  committed
  8671d1c

Commits on Jul 26, 2016

• Started incorporating Factory Girl into RSpec tests.

  gsrohde

  committed
  7ce90b1

• Fixed first test in trait_interface_spec.rb.

  gsrohde

  committed
  af02ee0

• Converted trait_interface_spec over to using Factory Girl.

  gsrohde

  committed
  21d43f0

Commits on Aug 1, 2016

• Fixed bugs in pretty_date and pretty_time functions.

  gsrohde

  committed
  b333289

Commits on Jun 28, 2017

• Merge branch 'master' into GH_356-357-tweaks

  gsrohde

  committed
  1682f36

Commits on Jul 17, 2017

• Merge branch 'master' into GH_356-357-tweaks

  gsrohde

  committed
  ea0681e

Commits on Jul 19, 2017

• Fixed pretty_date to show site timezone when timeloc is 9 and dateloc is 5.5.

  gsrohde

  committed
  f6225a9

• Fixed trait model test to be consistent with the July 2016 update to the trait model use accessors instead of instance variables to get the year, month, day, hour, and minute.

  gsrohde

  committed
  2fd4f9a

Commits on Dec 17, 2018

• Merge in branch 'GH_356-357-tweaks', modifying as appropriate.

  gsrohde

  committed
  b90ef72

Commits on Jan 16, 2019

• Merge branch 'develop' into merge_datetime_fixes

  gsrohde

  committed
  eb4336c

Commits on Mar 26, 2019

• Fix typo in abbreviation for season representing March-April-May.

  gsrohde

  committed
  3d5f096