Skip to content
This repository has been archived by the owner on Jul 24, 2020. It is now read-only.

[v3.4] 494 import equipment #897

Merged
merged 34 commits into from
Aug 4, 2014
Merged

[v3.4] 494 import equipment #897

merged 34 commits into from
Aug 4, 2014

Commits on Mar 25, 2014

  1. created import_equipment_models controller and started putting it tog… 

    …ether
    @orenyk
    orenyk committed Mar 25, 2014
    Configuration menu
    Copy the full SHA
    a5feecc View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2014

  1. Revert "created import_equipment_models controller and started puttin… 

    …g it together"

This reverts commit a5feecc.
    @orenyk
    orenyk committed Mar 27, 2014
    Configuration menu
    Copy the full SHA
    437f43d View commit details
    Browse the repository at this point in the history

  2. Created import_equipment_controller, set up routes, minor tweaks

    @orenyk
    orenyk committed Mar 27, 2014
    Configuration menu
    Copy the full SHA
    d50375e View commit details
    Browse the repository at this point in the history

  3. started filling in controller, put together import view

    @orenyk
    orenyk committed Mar 27, 2014
    Configuration menu
    Copy the full SHA
    14acc3c View commit details
    Browse the repository at this point in the history

  4. added strategy comments to controller

    @orenyk
    orenyk committed Mar 27, 2014
    Configuration menu
    Copy the full SHA
    ac03cf7 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2014

  1. fleshed out import structure, on to actual code :-)

    @orenyk
    orenyk committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    cb15839 View commit details
    Browse the repository at this point in the history

  2. fixed confusion about csv_import and filepath

    @orenyk
    orenyk committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    1f3c69a View commit details
    Browse the repository at this point in the history

  3. fixed example data and import page (downcase and underscore)

    @orenyk
    orenyk committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    1ea47b9 View commit details
    Browse the repository at this point in the history

  4. added general and specific validation methods

    @orenyk
    orenyk committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    0c34c8f View commit details
    Browse the repository at this point in the history

  5. added csv_import field to tables in database

    @orenyk
    orenyk committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    eb153cf View commit details
    Browse the repository at this point in the history

  6. started working on import code, comments for next time

    @orenyk
    orenyk committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    e7ac28d View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2014

  1. moved equipment import validators to lib file

    @orenyk
    orenyk committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    48399d8 View commit details
    Browse the repository at this point in the history

  2. started category import function

    @orenyk
    orenyk committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    dadb602 View commit details
    Browse the repository at this point in the history

  3. added include call to lib file in controller

    @orenyk
    orenyk committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    321b10d View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2014

  1. category import working, not sure about validators

    @orenyk
    orenyk committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    478c9eb View commit details
    Browse the repository at this point in the history

  2. fixed validators

    @orenyk
    orenyk committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    00ffa97 View commit details
    Browse the repository at this point in the history

  3. created model and object import methods, everything seems to work

    @orenyk
    orenyk committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    69d9072 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2014

  1. added rake task to undo example import

    @orenyk
    orenyk committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    6487896 View commit details
    Browse the repository at this point in the history

  2. updated test data

    @orenyk
    orenyk committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    6283012 View commit details
    Browse the repository at this point in the history

  3. fixed space issue in import view

    @orenyk
    orenyk committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    dc44653 View commit details
    Browse the repository at this point in the history

  4. added import status view and associated partials

    @orenyk
    orenyk committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    ddb50a7 View commit details
    Browse the repository at this point in the history

  5. added link to import page on equipment index views

    @orenyk
    orenyk committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    143f6f8 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2014

  1. added 'sort_order' as parameter for categories 

    Added :sort_order as an import parameter for categories; updated the relevant views (import and imported) as well as the import library and validation function.
    @orenyk
    orenyk committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    e3e5b8f View commit details
    Browse the repository at this point in the history

  2. created framework for library testing (I think)

    @orenyk
    orenyk committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    15be8dc View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2014

  1. getting tests to work

    @orenyk
    orenyk committed Apr 18, 2014
    Configuration menu
    Copy the full SHA
    c84e76d View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2014

  1. finally got working tests for methods, added file for CsvImport 

    added spec file for the CsvImport module and got working tests for the various module methods of EquipmentImport. Also added pending tests for functionality of both modules.
    @orenyk
    orenyk committed Apr 20, 2014
    Configuration menu
    Copy the full SHA
    e4deaa3 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2014

  1. started category testing code... having issues

    @orenyk
    orenyk committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    0dacf68 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2014

  1. Merge branch 'release-v3.4' into 494_import_equipment 

    Conflicts:
	spec/spec_helper.rb
    @orenyk
    orenyk committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    4ec20f8 View commit details
    Browse the repository at this point in the history

  2. update controller to use CanCan

    @orenyk
    orenyk committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    22ccd37 View commit details
    Browse the repository at this point in the history

  3. more CanCan modifications

    @orenyk
    orenyk committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    1feac10 View commit details
    Browse the repository at this point in the history

  4. more CanCan fixes in the view tables

    @orenyk
    orenyk committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    89a308f View commit details
    Browse the repository at this point in the history

  5. add link back to import page

    @orenyk
    orenyk committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    25f7d94 View commit details
    Browse the repository at this point in the history

  6. omg more CanCan fixes

    @orenyk
    orenyk committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    d9e8058 View commit details
    Browse the repository at this point in the history

  7. remove dev and spec files, clean up comments

    @orenyk
    orenyk committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    3138f9f View commit details
    Browse the repository at this point in the history