Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Export group #83

Merged
merged 29 commits into from
Sep 13, 2017
Merged

Export group #83

merged 29 commits into from
Sep 13, 2017

Commits on Mar 28, 2017

  1. Changes to linechart component to enable export of data. currently ab… 

    …le to return the name of the selection (as seen in the select meters window) and what i believe to be meter data of some kind (still need to confirm that this is meter data and not some abstraction)
    @kooolbreez1
    kooolbreez1 committed Mar 28, 2017
    Configuration menu
    Copy the full SHA
    aef9792 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2017

  1. Changes to linechart component to enable export of data. currently ab… 

    …le to return the name of the selection (as seen in the select meters window) and what i believe to be meter data of some kind (still need to confirm that this is meter data and not some abstraction)
    @kooolbreez1
    kooolbreez1 committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    d3bb015 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2017

  1. Changes to LineChartComponent, Readings.js in actions and LineChartCo… 

    …ntainer to enable the export of the state object
    @kooolbreez1
    kooolbreez1 committed Apr 5, 2017
    Configuration menu
    Copy the full SHA
    e381bd2 View commit details
    Browse the repository at this point in the history

  2. did stuff

    @RagingOcelot
    RagingOcelot committed Apr 5, 2017
    Configuration menu
    Copy the full SHA
    5f9996a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into exportGroup 

    # Conflicts:
#	src/client/app/components/LineChartComponent.jsx
#	src/client/app/containers/LineChartContainer.js
    @kooolbreez1
    kooolbreez1 committed Apr 5, 2017
    Configuration menu
    Copy the full SHA
    5e811fa View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into exportGroup 

    # Conflicts:
#	src/client/app/actions/readings.js
#	src/client/app/components/LineChartComponent.jsx
#	src/client/app/containers/LineChartContainer.js
    @RagingOcelot
    RagingOcelot committed Apr 5, 2017
    Configuration menu
    Copy the full SHA
    c3f6752 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/exportGroup' into exportGroup 

    # Conflicts:
#	src/client/app/actions/readings.js
    @kooolbreez1
    kooolbreez1 committed Apr 5, 2017
    Configuration menu
    Copy the full SHA
    7783382 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2017

  1. Able to access (compressed?) readings via the UIOptionsComponent.

    @kooolbreez1
    kooolbreez1 committed Apr 6, 2017
    Configuration menu
    Copy the full SHA
    950b045 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2017

  1. Able to format and download compressed meter data as a CSV file.

    @kooolbreez1
    kooolbreez1 committed Apr 7, 2017
    Configuration menu
    Copy the full SHA
    1d56556 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into exportGroup

    @kooolbreez1
    kooolbreez1 committed Apr 7, 2017
    Configuration menu
    Copy the full SHA
    539401e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into exportGroup

    @RagingOcelot
    RagingOcelot committed Apr 7, 2017
    Configuration menu
    Copy the full SHA
    d610906 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/exportGroup' into exportGroup

    @kooolbreez1
    kooolbreez1 committed Apr 7, 2017
    Configuration menu
    Copy the full SHA
    eda9804 View commit details
    Browse the repository at this point in the history

  5. added timestamp to exported Data

    @kooolbreez1
    kooolbreez1 committed Apr 7, 2017
    Configuration menu
    Copy the full SHA
    ff4f005 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2017

  1. Merge branch 'master' into exportGroup

    @RagingOcelot
    RagingOcelot committed Apr 10, 2017
    Configuration menu
    Copy the full SHA
    199d31d View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2017

  1. Merge branch 'master' into exportGroup

    @RagingOcelot
    RagingOcelot committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    5082823 View commit details
    Browse the repository at this point in the history

  2. changed name of the exported file to "exportedDataOED" instead of pro… 

    …mpting the user for a name. linted
    @kooolbreez1
    kooolbreez1 committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    b659757 View commit details
    Browse the repository at this point in the history

  3. fixed a comment I accidentally changed in dashboardContainer

    @kooolbreez1
    kooolbreez1 committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    c3fc89f View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2017

  1. compressed filename variable in exportData.js to 1 line and removed u… 

    …nnecessary conditional.
    @kooolbreez1
    kooolbreez1 committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    3ae6e54 View commit details
    Browse the repository at this point in the history

  2. Moved exportData.js to new services directory.

    @kooolbreez1
    kooolbreez1 committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    40dea5e View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2017

  1. preparing to merge with master

    @kooolbreez1
    kooolbreez1 committed Apr 23, 2017
    Configuration menu
    Copy the full SHA
    9db2746 View commit details
    Browse the repository at this point in the history

  2. Merging branch 'master' into exportGroup 

    # Conflicts:
#	src/client/app/actions/readings.js
#	src/client/app/components/UIOptionsComponent.jsx
#	src/client/app/containers/UIOptionsContainer.js
#	src/server/services/readMetasysData.js
    @kooolbreez1
    kooolbreez1 committed Apr 23, 2017
    Configuration menu
    Copy the full SHA
    3c22a47 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2017

  1. Now works with the updated UIOptions component and barcharts. can cur… 

    …rently only export data from linecharts (its the same data as shown on the bar chart however it may include extra data points that were not included on the bar charts.
    @kooolbreez1
    kooolbreez1 committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    6c0937f View commit details
    Browse the repository at this point in the history

  2. Successfully exports the displayed data from bar charts (for full dat… 

    …a set export from linechart) timestamps for bar chart exports don't currently display correctly
    @kooolbreez1
    kooolbreez1 committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    dc03958 View commit details
    Browse the repository at this point in the history

  3. Successfully exports the displayed data from bar charts (for full dat… 

    …a set export from linechart) timestamps for bar chart exports don't currently display correctly
    @kooolbreez1
    kooolbreez1 committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    538b85c View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2017

  1. the name of the exported file now dynamically changes based on the ti… 

    …mestamp of the first exported reading.
    @kooolbreez1
    kooolbreez1 committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    c91b9a6 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2017

  1. Name of exported file includes its chartType, the export button is wo… 

    …rking with react-bootstrap however it is not formatted nicely compared to UIOptions. changed "line" and "bar" to chartType object.
    @kooolbreez1
    kooolbreez1 committed May 3, 2017
    Configuration menu
    Copy the full SHA
    16f4e3a View commit details
    Browse the repository at this point in the history

  2. updated a line of code to mitigate a likely bug that would appear if … 

    …more chart types were added
    @kooolbreez1
    kooolbreez1 committed May 3, 2017
    Configuration menu
    Copy the full SHA
    4c6b4ec View commit details
    Browse the repository at this point in the history

  3. Export component is now rendered as art of the UI options component f… 

    …ixing the formatting errors.
    @kooolbreez1
    kooolbreez1 committed May 3, 2017
    Configuration menu
    Copy the full SHA
    a8ca745 View commit details
    Browse the repository at this point in the history

  4. ExportComponent is now a functional component instead of a class

    @kooolbreez1
    kooolbreez1 committed May 3, 2017
    Configuration menu
    Copy the full SHA
    394c155 View commit details
    Browse the repository at this point in the history