Merge from master to pull in fixes

.github/workflows/android-build.yml

@@ -0,0 +1,65 @@
+# This is a basic workflow to help you get started with Actions
+
+name: osx-ubuntu-build-android
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    - cron:  '5 4 * * 0'
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: macos-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+
+    # Runs a single command using the runners shell
+    - name: Print the java version
+      run: java -version
+
+    - name: Tries to figure out where android is installed
+      run: |
+        echo "Android listed at $ANDROID_HOME"
+        ls -al /opt/
+
+    - name: Setup the cordova environment
+      shell: bash -l {0}
+      run: |
+        bash setup/setup_android_native.sh
+
+    - name: Check tool versions
+      shell: bash -l {0}
+      run: |
+        source setup/activate_native.sh
+        echo "cordova version"
+        npx cordova -version
+        echo "ionic version"
+        npx ionic --version
+        which gradle
+        echo "gradle version"
+        gradle -version
+
+    - name: Build android
+      shell: bash -l {0}
+      run: |
+        echo $PATH
+        which gradle
+        gradle -version
+        echo "Let's rerun the activation"
+        source setup/activate_native.sh
+        echo $PATH
+        which gradle
+        gradle --version
+        npx cordova build android

.github/workflows/ci-test.yml

@@ -0,0 +1,33 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+
+    # Runs a single command using the runners shell
+    - name: Run a one-line script
+      run: echo Hello, world!
+
+    # Runs a set of commands using the runners shell
+    - name: Run a multi-line script
+      run: |
+        echo Add other actions to build,
+        echo test, and deploy your project.

.github/workflows/ios-build.yml

@@ -0,0 +1,64 @@
+# This is a basic workflow to help you get started with Actions
+
+name: osx-build-ios
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    - cron:  '5 4 * * 0'
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: macos-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+
+    # Runs a single command using the runners shell
+    - name: Print the xcode path
+      run: xcode-select --print-path
+
+    - name: Print the xcode setup
+      run: xcodebuild -version -sdk
+
+    - name: Print applications through dmg
+      run: ls /Applications
+
+    - name: Print applications through brew
+      run: brew list --formula
+
+    - name: Setup the cordova environment
+      shell: bash -l {0}
+      run: |
+        bash setup/setup_ios_native.sh
+
+    - name: Check tool versions
+      shell: bash -l {0}
+      run: |
+        source setup/activate_native.sh
+        echo "cordova version"
+        npx cordova -version
+        echo "ionic version"
+        npx ionic --version
+
+    - name: Build ios
+      shell: bash -l {0}
+      run: |
+        source setup/activate_native.sh
+        npx cordova build ios
+
+    - name: Cleanup the cordova environment
+      shell: bash -l {0}
+      run: bash setup/teardown_ios_native.sh
+

.github/workflows/serve-install.yml

@@ -0,0 +1,58 @@
+# This is a basic workflow to help you get started with Actions
+
+name: osx-serve-install
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    - cron:  '5 4 * * 0'
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: macos-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+
+    # Runs a single command using the runners shell
+    - name: Print the xcode path
+      run: xcode-select --print-path
+
+    - name: Print the xcode setup
+      run: xcodebuild -version -sdk
+
+    - name: Print applications through dmg
+      run: ls /Applications
+
+    - name: Print applications through brew
+      run: brew list --formula
+
+    - name: Setup the serve environment
+      shell: bash -l {0}
+      run: |
+        bash setup/setup_serve.sh
+
+    - name: Check tool versions
+      shell: bash -l {0}
+      run: |
+        source setup/activate_serve.sh
+        echo "cordova version"
+        npx cordova -version
+        echo "ionic version"
+        npx ionic --version
+
+# TODO: figure out how to check that a server started correctly
+#    - name: Try starting it
+#      run: npx run serve
+

.gitignore

@@ -9,4 +9,12 @@ package-hooks/
 .DS_Store
 app-settings.json
 .idea/
-.io-config.json
+.io-config.json
+*.apk
+*.app.zip
+*.ipa
+www/js/control/collect-settings.js
+www/js/control/sync-settings.js
+www/js/control/transition-notify-settings.js
+config.xml
+package.json

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 22015-2018, e-mission
+Copyright (c) 2020-2021, Alliance for Sustainable Energy
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

OpenSourceLicenses.md

@@ -0,0 +1,100 @@
+This file lists the module dependencies for the project and their licenses.
+
+1. Most of this module code is **not** redistributed, either in source or binary
+form. Instead, it is downloaded automatically using package managers and linked
+from the code. The module download includes the license and appropriate credit.
+
+1. So our primary check here is for modules which do not have a license, or
+which are GPL licensed.
+
+The original project was created based on the ionic starter tabs template
+https://github.com/ionic-team/ionic-starter-tabs
+which is explicitly designed to provide a template for developers.
+
+## Redistributed, modified javascript dependencies
+
+These dependencies were checked in over time in order to support libraries that
+did not have bower entries, or libraries that were modified with minor changes
+based on bugs. TODO: Go through the modules, determine the changes and submit them as PRs 🚧
+
+| Module | License | Original code |
+|--------|---------|---------------|
+| `www/manual_lib/angularjs-nvd3-directives` | Apache |
+| `www/manual_lib/fontawesome` | Icons: CC BY 4.0, Code: MIT License | https://fontawesome.com |
+| `www/manual_lib/ionic-datepicker` | MIT | https://github.com/rajeshwarpatlolla/ionic-datepicker |
+| `www/manual_lib/leaflet` | BSD 2-clause | https://github.com/Leaflet/Leaflet | 
+| `www/manual_lib/ui-leaflet` | MIT | https://github.com/angular-ui/ui-leaflet 🗄️ | 
+
+## Javascript dependencies installed via bower
+
+| Module | License |
+|--------|---------|
+| `www/lib/ionic` | MIT (from [`bower.json`](https://github.com/ionic-team/ionic-bower/blob/v1.3.0/bower.json)) |
+| `www/lib/ionic-toast` | MIT |
+| `www/lib/moment` | MIT |
+| `www/lib/moment-timezone` | MIT |
+| `www/lib/Leaflet.awesome-markers` | MIT |
+| `www/lib/angular` | MIT |
+| `www/lib/angular-animate` | MIT |
+| `www/lib/angular-sanitize` | MIT |
+| `www/lib/angular-nvd3` | MIT |
+| `www/lib/angularLocalStorage` | MIT |
+| `www/lib/ng-walkthrough` | MIT |
+| `www/lib/animate.css` | MIT |
+| `www/lib/nz-tour` | MIT |
+| `www/lib/leaflet-plugins` | MIT |
+| `www/lib/angularjs-slider` | MIT |
+| `www/lib/angular-translate` | MIT |
+| `www/lib/angular-translate-loader-static-files` | MIT |
+| `www/lib/angular-translate-interpolation-messageformat` | MIT |
+
+## Javascript dependencies installed via npm `package.json`
+
+Note that some of these are only required for development, not for proper operation.
+Not sure whether we should list them or not, but it doesn't hurt.
+
+| Module | License |
+|--------|---------|
+| phonegap | Apache |
+| fs-extra | MIT |
+| klaw-sync | MIT |
+
+## Javascript dependencies installed via npm command line
+
+| Module | License |
+|--------|---------|
+| cordova | Apache |
+| bower   | MIT    |
+| ionic   | MIT    |
+
+## Cordova platforms, installed automatically
+
+| Module | License |
+|--------|---------|
+| cordova-ios     | Apache |
+| cordova-android | Apache |
+
+## Cordova plugins, installed automatically
+
+| Module | License |
+|--------|---------|
+| phonegap-plugin-push | MIT |
+| ionic-plugin-keyboard | Apache |
+| cordova-plugin-app-version | MIT    |
+| cordova-plugin-file | Apache |
+| cordova-plugin-device | Apache |
+| cordova-plugin-whitelist | Apache |
+| cordova-plugin-customurlscheme | MIT |
+| cordova-plugin-email-composer | Apache |
+| cordova-plugin-x-socialsharing | MIT |
+| cordova-plugin-inappbrowser | Apache |
+| de.appplant.cordova.plugin.local-notification-ios9-fix | Apache |
+| cordova-plugin-ionic | MIT |
+| edu.berkeley.eecs.emission.cordova.auth | BSD 3-clause |
+| edu.berkeley.eecs.emission.cordova.comm | BSD 3-clause |
+| edu.berkeley.eecs.emission.cordova.datacollection | BSD 3-clause |
+| edu.berkeley.eecs.emission.cordova.serversync | BSD 3-clause |
+| edu.berkeley.eecs.emission.cordova.settings | BSD 3-clause |
+| edu.berkeley.eecs.emission.cordova.transitionnotify | BSD 3-clause |
+| edu.berkeley.eecs.emission.cordova.unifiedlogger | BSD 3-clause |
+| edu.berkeley.eecs.emission.cordova.usercache | BSD 3-clause |