cm mb 12/30/15

README.md

@@ -8,7 +8,9 @@ Build and Install Process
 3. Run `npm install`
 4. Run `npm install grunt-cli yo angular-generator`
 5. Run `bower install`
-6. Run `. build_local.bash` to serve or `. build_dist.bash` to make a distributable version
+6. Run `. build_local.bash` to serve locally
+7. Run `. build_dist.bash` to make a distributable version, zip the "dist" folder and update to the build.phonegap.com site previously configured
+
 
 To seed the application:
 ------------------------

cordova.bash

@@ -8,26 +8,17 @@ grunt build --force
 wait
 
 echo 'Completed building distribution folder'
-echo 'Starting server'
 
 cp app/styles/bootstrap.min.css dist/styles
 cp app/images/logo.png dist/images
 
 rm -rf cordova/www
 mkdir cordova/www
 cp -r dist/* cordova/www/
+
 cd cordova
-cordova build android --release
-cd platforms/android/ant-build
 
-jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore LiveWell.keystore CordovaApp-release-unsigned.apk LiveWell
-
-echo 'type the keystore password'
-
-zipalign -f -v 4 CordovaApp-release-unsigned.apk LiveWell.apk
-
-cd ..
-cd ..
-cd ..
+./../node_modules/cordova/bin/cordova build android 
 cd ..
 
+echo 'App built '

dist/index.html

@@ -2,7 +2,7 @@
       <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
     <![endif]--> <!-- Add your site or application content here --> <div class="container"> <div ng-view></div> </div> <!--[if lt IE 9]>
     <script src="scripts/oldieshim.ff90b0fb.js"></script>
-    <![endif]--> <script src="scripts/vendor.383a5d19.js"></script> <script src="scripts/scripts.c9ad5818.js"></script> <script src="cordova.js"></script> <script src="cordova_plugins.js"></script> <script>document.addEventListener("deviceready", function() {
+    <![endif]--> <script src="scripts/vendor.383a5d19.js"></script> <script src="scripts/scripts.0f4fbca7.js"></script> <script src="cordova.js"></script> <script src="cordova_plugins.js"></script> <script>document.addEventListener("deviceready", function() {
 
             document.addEventListener("resume", function() {
                 window.location.href = "index.html";

dist/views/daily_check_in.html

@@ -1 +1 @@
-<div ng-include="'views/partials/navbar.html'"></div> <div id="warning" class="modal fade"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-body alert-danger"> {{selectedWarningMessage}}<br><br> <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> <div id="continue" class="modal fade"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-body alert-warning"> <a ng-href="#/daily_review/{{nextId}}" class="btn btn-primary btn-full" ng-show="!emergency">Continue to Daily Review</a><br> <div class="alert alert-danger" ng-show="emergency">Please contact your doctor.</div> <a ng-href="#/" class="btn btn-primary btn-full">Return Home</a> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> <form ng-submit="saveCheckIn()" class="center-form"> <h4>Medications</h4> <div class="row-fluid"> <label class="btn btn-success col-sm-4 col-md-4 col-xs-4"> <input type="radio" ng-model="dailyCheckIn.medications" value="2"> All</label> <label class="btn btn-warning col-sm-4 col-md-4 col-xs-4"> <input type="radio" ng-model="dailyCheckIn.medications" value="1"> Some</label> <label class="btn btn-danger col-sm-4 col-md-4 col-xs-4"> <input type="radio" ng-model="dailyCheckIn.medications" value="0"> None</label> </div> <br><br> <h4>Went To Bed</h4> <select ng-model="dailyCheckIn.toBed" name="toBed"> <option ng-repeat="time in times" value="{{time.value}}" style="color:black !important">{{time.label}} </select> <h4>Got Up</h4> <select ng-model="dailyCheckIn.gotUp" name="gotUp"> <option ng-repeat="time in times" value="{{time.value}}" style="color:black !important">{{time.label}} </select> <h4>Wellness</h4> <div class="btn-group btn-group-justified" data-toggle="buttons"> <label ng-click="highlight('#button{{response.order}}','{{response.response}}');warning('{{response.warningMessage}}')" id="button{{response.order}}" class="btn bgcolor{{response.order}} btn-group-radio" ng-repeat="response in responses">{{response.label}} </label></div> <br> <button type="submit" class="btn btn-primary btn-full">Submit</button> </form>
+<div ng-include="'views/partials/navbar.html'"></div> <div id="warning" class="modal fade"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-body alert-danger"> {{selectedWarningMessage}}<br><br> <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> <div id="continue" class="modal fade"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-body alert-warning"> <a ng-href="#/daily_review/{{nextId}}" class="btn btn-primary btn-full" ng-show="!emergency">Continue to Daily Review</a><br> <div class="alert alert-danger" ng-show="emergency">Please contact your doctor {{doctorName}} at <a ng-click="notifyCareGroup()" href="phone:{{doctorPhone}}" class="btn btn-full btn-primary">{{doctorPhone}}</a></div> <a ng-href="#/" class="btn btn-primary btn-full">Return Home</a> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> <form ng-submit="saveCheckIn()" class="center-form"> <h4>Medications</h4> <div class="row-fluid"> <label class="btn btn-success col-sm-4 col-md-4 col-xs-4"> <input type="radio" ng-model="dailyCheckIn.medications" value="2"> All</label> <label class="btn btn-warning col-sm-4 col-md-4 col-xs-4"> <input type="radio" ng-model="dailyCheckIn.medications" value="1"> Some</label> <label class="btn btn-danger col-sm-4 col-md-4 col-xs-4"> <input type="radio" ng-model="dailyCheckIn.medications" value="0"> None</label> </div> <br><br> <h4>Went To Bed</h4> <select ng-model="dailyCheckIn.toBed" name="toBed"> <option ng-repeat="time in times" value="{{time.value}}" style="color:black !important">{{time.label}} </select> <h4>Got Up</h4> <select ng-model="dailyCheckIn.gotUp" name="gotUp"> <option ng-repeat="time in times" value="{{time.value}}" style="color:black !important">{{time.label}} </select> <h4>Wellness</h4> <div class="btn-group btn-group-justified" data-toggle="buttons"> <label ng-click="highlight('#button{{response.order}}','{{response.response}}');warning('{{response.warningMessage}}')" id="button{{response.order}}" class="btn bgcolor{{response.order}} btn-group-radio" ng-repeat="response in responses">{{response.label}} </label></div> <br> <button type="submit" class="btn btn-primary btn-full">Submit</button> </form>

dist/views/myskills.html

@@ -1 +1 @@
-<div class="row"> <div class="col-sm-2 col-xs-2 col-md-2"><br> <a ng-href="#/" class="btn-lg" style="color:white"><span class="glyphicon glyphicon-home"></span></a></div> <div class="col-sm-8 col-xs-8 col-md-8 text-center"> <h3>Skills </h3> </div> <div class="col-sm-2 col-xs-2 col-md-2"> </div> </div> <div class="well" ng-show="mySkills.length < 1"> <i>When you have added skills, they will appear here.</i> </div> <div ng-show="mySkills.length > 0 && currentSkillId == null"> <div ng-repeat="mySkill in mySkills"> <button ng-click="showSkill({{mySkill}})" class="btn btn-info wide" style="margin-bottom:10px">{{skill(mySkill)[0].pretty_name}}</button> </div> </div> <div ng-show="currentSkillId != null"> <div ng-bind-html="currentSkillContent.trim()" class="content"></div><br> <button ng-click="currentSkillId = null" class="btn btn-default">Return to My Skills</button> <button ng-click="removeSkill()" class="btn btn-danger">Remove from My Skills</button> </div>
+<div class="row"> <div class="col-sm-2 col-xs-2 col-md-2"><br> <a ng-href="#/" class="btn-lg" style="color:white"><span class="glyphicon glyphicon-home"></span></a></div> <div class="col-sm-8 col-xs-8 col-md-8 text-center"> <h3>My Skills</h3> </div> <div class="col-sm-2 col-xs-2 col-md-2"> </div> </div> <div class="well" ng-show="mySkills.length < 1"> <i>When you have added skills, they will appear here.</i> </div> <div ng-show="mySkills.length > 0 && currentSkillId == null"> <div ng-repeat="mySkill in mySkills"> <button ng-click="showSkill({{mySkill}})" class="btn btn-info wide" style="margin-bottom:10px">{{skill(mySkill)[0].pretty_name}}</button> </div> </div> <div ng-show="currentSkillId != null"> <div ng-bind-html="currentSkillContent.trim()" class="content"></div><br> <button ng-click="currentSkillId = null" class="btn btn-default">Return to My Skills</button> <button ng-click="removeSkill()" class="btn btn-danger">Remove from My Skills</button> </div>

dist/views/partials/resources.html

@@ -1 +1 @@
-<a ng-href="#/medications" class="btn btn-info btn-full">My Medications</a><br> <a ng-href="#/team" class="btn btn-info btn-full">My Team</a><br> <a ng-href="#/mySkills" class="btn btn-info btn-full">My Skills</a><br> <a ng-href="#/charts" class="btn btn-info btn-full">My Charts</a><br> <a ng-href="#/schedule" class="btn btn-info btn-full">My Schedule</a><br>
+<a ng-href="#/medications" class="btn btn-primary btn-full">My Medications</a><br> <a ng-href="#/team" class="btn btn-primary btn-full">My Team</a><br> <a ng-href="#/mySkills" class="btn btn-primary btn-full">My Skills</a><br> <a ng-href="#/charts" class="btn btn-primary btn-full">My Charts</a><br> <a ng-href="#/schedule" class="btn btn-primary btn-full">My Schedule</a><br>