update data

diff --git a/sql/data/bf_eqs.csv b/sql/data/bf_eqs.csv
deleted file mode 100644 (file)
index e26f6d0..0000000
--- a/sql/data/bf_eqs.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-id,name
-1,NAVY
-2,3SITE
-3,7SITE

diff --git a/sql/data/bio_log_entry.csv b/sql/data/bio_log_entry.csv
deleted file mode 100644 (file)
index 0490aa4..0000000
--- a/sql/data/bio_log_entry.csv
+++ /dev/null
@@ -1,132 +0,0 @@
-log_id,biometric_id,value
-1,22,61
-1,23,100
-1,24,54
-2,22,68
-2,23,93
-2,24,54
-3,22,62
-3,23,103
-3,24,50
-4,22,66
-4,23,99
-4,24,58
-5,22,82
-5,23,115
-5,24,63
-6,22,0
-6,23,104
-6,24,59
-7,22,70
-7,23,108
-7,24,63
-8,22,59
-8,23,112
-8,24,61
-9,22,62
-9,23,108
-9,24,65
-10,1,177
-10,2,67
-10,3,17.2
-10,4,21.6
-10,5,93.345
-10,6,28.575
-10,7,50.8
-10,8,35.56
-10,9,109.22
-10,10,78.74
-10,11,91.44
-10,12,38.1
-10,13,26.67
-10,14,10
-10,15,15
-10,16,14
-10,17,13
-10,18,10
-10,19,12
-10,20,9
-11,22,53
-11,23,91
-11,24,60
-12,22,56
-12,23,101
-12,24,63
-13,22,64
-13,23,105
-13,24,62
-14,1,33
-14,2,8.71
-14,5,24.13
-14,6,10.795
-14,9,50.8
-14,10,46.355
-14,12,31.75
-15,1,179
-15,2,74
-15,3,17.2
-15,4,21.5
-15,5,100.965
-15,6,28.575
-15,7,55.245
-15,8,37.465
-15,9,115.57
-15,10,86.995
-15,11,95.25
-15,12,38.1
-15,13,26.67
-15,14,19
-15,15,34
-15,16,14
-15,17,18
-15,18,12
-15,19,13
-15,20,15
-16,22,59
-16,23,103
-16,24,63
-17,22,53
-17,23,107
-17,24,66
-18,2,73
-18,14,18
-18,15,26
-18,16,15
-19,2,7.26
-20,22,61
-20,23,103
-20,24,65
-21,22,97
-21,23,110
-21,24,71
-22,22,62
-22,23,106
-22,24,68
-23,22,59
-23,23,110
-23,24,66
-24,22,59
-24,23,92
-24,24,58
-25,2,70
-26,2,65.4
-27,2,71
-28,2,67.6
-29,2,66
-30,2,67.2
-31,22,58
-31,23,102
-31,24,61
-32,22,83
-32,23,113
-32,24,64
-33,22,78
-33,23,105
-33,24,70
-34,2,69.5
-35,2,66.2
-36,2,68.4
-37,22,66
-37,23,103
-37,24,63
-38,2,65.2

diff --git a/sql/data/biometric_log.csv b/sql/data/biometric_log.csv
index 14259120790248c879b9e4388ccfdf8ff5f7dd36..35db92a0ba52cd1bf4235ad28bba0adc69b046f7 100644 (file)
--- a/sql/data/biometric_log.csv
+++ b/sql/data/biometric_log.csv
@@ -1,39 +1,39 @@
-id,profile_id,created,updated,date,tags,notes
-1,1,1601977400,1601977400,Sun 28 Jun 2020 02:07:01 PM EDT,exercise,
-2,2,1601977400,1601977400,Sun 28 Jun 2020 02:07:01 PM EDT,exercise,
-3,1,1601977400,1601977400,Sun 28 Jun 2020 02:38:20 PM EDT,,
-4,2,1601977400,1601977400,Sun 28 Jun 2020 02:38:20 PM EDT,,
-5,1,1601977400,1601977400,Sun 28 Jun 2020 10:05:26 PM EDT,exercise,
-6,2,1601977400,1601977400,Thu 02 Jul 2020 12:12:54 PM EDT,,doctor's office
-7,1,1601977400,1601977400,Sat 04 Jul 2020 03:50:13 PM EDT,,
-8,2,1601977400,1601977400,Sat 04 Jul 2020 03:54:27 PM EDT,,
-9,2,1601977400,1601977400,Sun 05 Jul 2020 01:30:44 PM EDT,no THC,
-10,1,1601977400,1601977400,Mon 06 Jul 2020 06:54:49 AM EDT,,
-11,2,1601977400,1601977400,Sun 12 Jul 2020 12:29:11 PM EDT,THC,
-12,2,1601977400,1601977400,Sun 12 Jul 2020 02:44:25 PM EDT,THC,
-13,1,1601977400,1601977400,Sun 12 Jul 2020 02:44:25 PM EDT,THC,
-14,3,1601977400,1601977400,Mon 13 Jul 2020 03:30:46 PM EDT,,
-15,2,1601977400,1601977400,Fri 17 Jul 2020 02:02:12 PM EDT,,
-16,2,1601977400,1601977400,Fri 17 Jul 2020 03:14:37 PM EDT,THC,
-17,1,1601977400,1601977400,Fri 17 Jul 2020 03:14:37 PM EDT,,
-18,2,1601977400,1601977400,Sat 08 Aug 2020 01:53:25 PM EDT,,
-19,3,1601977400,1601977400,Thu 27 Aug 2020 12:44:37 PM EDT,,
-20,2,1601977400,1601977400,Fri 28 Aug 2020 03:40:56 PM EDT,,
-21,1,1601977400,1601977400,Fri 28 Aug 2020 03:40:56 PM EDT,THC,1st dabs/2 weeks
-22,2,1601977400,1601977400,Sun 06 Sep 2020 11:49:47 AM EDT,,
-23,1,1601977400,1601977400,Sun 06 Sep 2020 11:53:21 AM EDT,,
-24,2,1601977400,1601977400,Sat 12 Sep 2020 12:15:53 PM EDT,,
-25,2,1601977400,1601977400,Sun 06 Sep 2020,,
-26,1,1601977400,1601977400,Sun 06 Sep 2020,,
-27,2,1601977400,1601977400,Sat 12 Sep 2020,,
-28,1,1601977400,1601977400,Sat 12 Sep 2020,,
-29,1,1601977400,1601977400,Sun 13 Sep 2020,,
-30,1,1601977400,1601977400,Mon 14 Sep 2020,,
-31,1,1601977400,1601977400,Fri 18 Sep 2020 09:04:38 PM EDT,exercise,
-32,2,1601977400,1601977400,Thu 24 Sep 2020 05:05:51 PM EDT,illness,
-33,1,1601977400,1601977400,Thu 24 Sep 2020 05:05:51 PM EDT,,
-34,2,1601977400,1601977400,Thu 24 Sep 2020,,
-35,1,1601977400,1601977400,Fri 25 Sep 2020,gym scale,
-36,2,1601977400,1601977400,Sat 26 Sep 2020,,
-37,2,1601977400,1601977400,Sat 26 Sep 2020 11:54:17 AM EDT,,
-38,1,1601977400,1601977400,Tue 29 Sep 2020 03:40:37 PM EDT,nude,
+id,profile_id,created,updated,date,tags,notes,value
+1,1,1601977400,1601977400,Sun 28 Jun 2020 02:07:01 PM EDT,exercise,10
+2,2,1601977400,1601977400,Sun 28 Jun 2020 02:07:01 PM EDT,exercise,11
+3,1,1601977400,1601977400,Sun 28 Jun 2020 02:38:20 PM EDT,,11
+4,2,1601977400,1601977400,Sun 28 Jun 2020 02:38:20 PM EDT,,11
+5,1,1601977400,1601977400,Sun 28 Jun 2020 10:05:26 PM EDT,exercise,11
+6,2,1601977400,1601977400,Thu 02 Jul 2020 12:12:54 PM EDT,,doctor's office,11
+7,1,1601977400,1601977400,Sat 04 Jul 2020 03:50:13 PM EDT,,5
+8,2,1601977400,1601977400,Sat 04 Jul 2020 03:54:27 PM EDT,,11
+9,2,1601977400,1601977400,Sun 05 Jul 2020 01:30:44 PM EDT,no THC,5
+10,1,1601977400,1601977400,Mon 06 Jul 2020 06:54:49 AM EDT,,5
+11,2,1601977400,1601977400,Sun 12 Jul 2020 12:29:11 PM EDT,THC,1111
+12,2,1601977400,1601977400,Sun 12 Jul 2020 02:44:25 PM EDT,THC,5
+13,1,1601977400,1601977400,Sun 12 Jul 2020 02:44:25 PM EDT,THC,5
+14,3,1601977400,1601977400,Mon 13 Jul 2020 03:30:46 PM EDT,,5
+15,2,1601977400,1601977400,Fri 17 Jul 2020 02:02:12 PM EDT,,11
+16,2,1601977400,1601977400,Fri 17 Jul 2020 03:14:37 PM EDT,THC,5
+17,1,1601977400,1601977400,Fri 17 Jul 2020 03:14:37 PM EDT,,5
+18,2,1601977400,1601977400,Sat 08 Aug 2020 01:53:25 PM EDT,,11
+19,3,1601977400,1601977400,Thu 27 Aug 2020 12:44:37 PM EDT,,5
+20,2,1601977400,1601977400,Fri 28 Aug 2020 03:40:56 PM EDT,,11
+21,1,1601977400,1601977400,Fri 28 Aug 2020 03:40:56 PM EDT,THC,1st dabs/2 weeks,5
+22,2,1601977400,1601977400,Sun 06 Sep 2020 11:49:47 AM EDT,,11
+23,1,1601977400,1601977400,Sun 06 Sep 2020 11:53:21 AM EDT,,5
+24,2,1601977400,1601977400,Sat 12 Sep 2020 12:15:53 PM EDT,,5
+25,2,1601977400,1601977400,Sun 06 Sep 2020,,5
+26,1,1601977400,1601977400,Sun 06 Sep 2020,,5
+27,2,1601977400,1601977400,Sat 12 Sep 2020,,5
+28,1,1601977400,1601977400,Sat 12 Sep 2020,,11
+29,1,1601977400,1601977400,Sun 13 Sep 2020,,11
+30,1,1601977400,1601977400,Mon 14 Sep 2020,,5
+31,1,1601977400,1601977400,Fri 18 Sep 2020 09:04:38 PM EDT,exercise,11
+32,2,1601977400,1601977400,Thu 24 Sep 2020 05:05:51 PM EDT,illness,5
+33,1,1601977400,1601977400,Thu 24 Sep 2020 05:05:51 PM EDT,,1111
+34,2,1601977400,1601977400,Thu 24 Sep 2020,,5
+35,1,1601977400,1601977400,Fri 25 Sep 2020,gym scale,11
+36,2,1601977400,1601977400,Sat 26 Sep 2020,,5
+37,2,1601977400,1601977400,Sat 26 Sep 2020 11:54:17 AM EDT,,5
+38,1,1601977400,1601977400,Tue 29 Sep 2020 03:40:37 PM EDT,nude,11

diff --git a/sql/data/bmr_eqs.csv b/sql/data/bmr_eqs.csv
deleted file mode 100644 (file)
index 399d4f8..0000000
--- a/sql/data/bmr_eqs.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,name
-1,HARRIS_BENEDICT
-2,KATCH_MACARDLE
-3,MIFFLIN_ST_JEOR
-4,CUNNINGHAM

diff --git a/sql/data/food_log.csv b/sql/data/food_log.csv
index 65808e328a8c6d04fdefee5cb3e2c184cdba870f..b1e778ee1595b6acc283f3ec2e449216ecd80e3f 100644 (file)
--- a/sql/data/food_log.csv
+++ b/sql/data/food_log.csv
@@ -1,4 +1,4 @@
-id,profile_id,created,updated,date,meal_id,food_id,msre_id,amt
+id,profile_id,created,updated,date,meal_id,food_id,msre_id,msre_amount
 1,1,1601977400,1601977400,2020-09-20,1,13047,-1,100
 2,1,1601977400,1601977400,2020-09-20,1,1270,-1,28
 3,1,1601977400,1601977400,2020-09-20,1,9038,-1,55

diff --git a/sql/data/profiles.csv b/sql/data/profiles.csv
index 16e46a8d0c2c0eb7525adfd84336ed24a9918c44..ee5100a7176d3657c50176cb3784b047ca6f7a86 100644 (file)
--- a/sql/data/profiles.csv
+++ b/sql/data/profiles.csv
@@ -1,4 +1,4 @@
-id,name,created,updated,eula,gender,dob,act_lvl,goal_wt,goal_bf,bmr_id,bf_id
-1,Shane,1601067725,1601067725,,MALE,1993-01-01,2,78,0.12,1,1
-2,Mark,1601068574,1601068574,,MALE,1957-01-01,2,72,0.14,1,1
-3,Rocky,1601068718,1601068718,,DOG,2007-08-01,2,7.3,,1,1
+id,name,created,updated,eula,gender,dob,act_lvl,goal_wt,goal_bf,bmr_id,bf_id,pwd_hash
+1,Shane,1601067725,1601067725,,MALE,1993-01-01,2,78,0.12,1,1,password
+2,Mark,1601068574,1601068574,,MALE,1957-01-01,2,72,0.14,1,1,password
+3,Rocky,1601068718,1601068718,,DOG,2007-08-01,2,7.3,,1,1,password

diff --git a/sql/data/rda.csv b/sql/data/rda.csv
deleted file mode 100644 (file)
index f90d012..0000000
--- a/sql/data/rda.csv
+++ /dev/null
@@ -1,80 +0,0 @@
-profile_id,nutr_id,rda
-3,203,18
-3,204,25
-3,205,60
-3,208,501
-3,269,15
-3,291,9
-3,301,300
-3,303,4
-3,304,100
-3,305,250
-3,306,1300
-3,307,350
-3,309,3
-3,312,0.2
-3,315,0.6
-3,317,15
-3,318,1000
-3,320,250
-3,324,100
-3,328,5
-3,337,900
-3,338,2000
-3,401,30
-3,404,0.3
-3,405,0.35
-3,406,4
-3,410,1.25
-3,415,0.4
-3,417,100
-3,418,0.6
-3,421,110
-3,430,30
-3,501,0.1
-3,502,0.3
-3,503,0.5
-3,504,1
-3,505,0.8
-3,506,0.3
-3,508,0.3
-3,509,0.4
-3,510,0.5
-3,511,0.3
-3,512,0.2
-3,513,0.3
-3,514,0.3
-3,515,0.5
-3,516,0.2
-3,517,0.2
-3,518,0.4
-3,601,50
-3,605,0
-3,606,7
-3,621,0.1
-3,629,0.05
-3,645,10
-3,646,6
-3,710,8
-3,711,4
-3,713,11
-3,731,5
-3,734,10
-3,735,5
-3,736,5
-3,737,2
-3,738,1
-3,749,10
-3,750,10
-3,751,10
-3,752,10
-3,753,15
-3,759,20
-3,762,15
-3,770,8
-3,773,5
-3,785,5
-3,786,1.5
-3,788,0.5
-3,789,5
-3,851,0.3

diff --git a/sql/data/recipe_dat.csv b/sql/data/recipe_dat.csv
index c1aaddacbbd997b6e3187ee085ea777f4d733e9c..05e425fbc215c4cc86ae0ba9027f272fa3e7d6c7 100644 (file)
--- a/sql/data/recipe_dat.csv
+++ b/sql/data/recipe_dat.csv
@@ -1,39 +1,39 @@
-recipe_id,food_id,grams,notes
-1,20045,180,white rice
-1,16042,25,pinto beans
-1,11282,45,onions
-1,11260,45,mushrooms
-1,11821,35,bell peppers
-1,11233,25,kale
-1,23293,85,"beef (grass-fed, 85/15)"
-1,11529,40,tomatoes
-1,9037,40,avocados
-1,1009,20,cheese (cheddar)
-2,18351,55,roll (mixed-grain)
-2,23293,85,"beef (grass-fed, 85/15)"
-2,1009,20,cheddar cheese
-2,11251,25,lettuce (romaine)
-2,11529,40,tomatoes
-2,11282,20,onions
-2,9037,40,avocados
-3,11355,300,potatoes (red)
-3,4053,30,olive oil
-3,11297,30,parsley (fresh)
-4,20011,60,flour (buckwheat)
-4,20140,30,flour (spelt)
-4,20080,30,flour (whole wheat)
-4,1123,56,egg
-4,1079,244,milk (2%)
-4,19911,25,syrup (maple)
-4,16122,20,protein (soy or whey)
-4,2047,1.5,salt
-4,18372,1.5,baking soda
-4,18370,0.75,baking powder
-5,12061,50,almonds
-5,12220,30,flaxseed
-5,12012,20,hemp (seed/protein)
-5,16122,28,protein (soy or whey)
-5,9050,50,blueberries
-5,9040,80,bananas
-5,9176,40,mangos
-5,1289,140,kefir
+recipe_id,food_id,amount,notes,msre_id
+1,20045,180,white rice,1
+1,16042,25,pinto beans,1
+1,11282,45,onions,1
+1,11260,45,mushrooms,1
+1,11821,35,bell peppers,1
+1,11233,25,kale,1
+1,23293,85,"beef (grass-fed, 85/15)",1
+1,11529,40,tomatoes,1
+1,9037,40,avocados,1
+1,1009,20,cheese (cheddar),1
+2,18351,55,roll (mixed-grain),1
+2,23293,85,"beef (grass-fed, 85/15)",1
+2,1009,20,cheddar cheese,1
+2,11251,25,lettuce (romaine),1
+2,11529,40,tomatoes,1
+2,11282,20,onions,1
+2,9037,40,avocados,1
+3,11355,300,potatoes (red),1
+3,4053,30,olive oil,1
+3,11297,30,parsley (fresh),1
+4,20011,60,flour (buckwheat),1
+4,20140,30,flour (spelt),1
+4,20080,30,flour (whole wheat),1
+4,1123,56,egg,1
+4,1079,244,milk (2%),1
+4,19911,25,syrup (maple),1
+4,16122,20,protein (soy or whey),1
+4,2047,1.5,salt,1
+4,18372,1.5,baking soda,1
+4,18370,0.75,baking powder,1
+5,12061,50,almonds,1
+5,12220,30,flaxseed,1
+5,12012,20,hemp (seed/protein),1
+5,16122,28,protein (soy or whey),1
+5,9050,50,blueberries,1
+5,9040,80,bananas,1
+5,9176,40,mangos,1
+5,1289,140,kefir,1

diff --git a/sql/data/version.csv b/sql/data/version.csv
index 308de8a85f46e086abdd7b62521bccfa8be5e362..e67bc17c7ee4b796e06d9fb7d2f469d23bc17589 100644 (file)
--- a/sql/data/version.csv
+++ b/sql/data/version.csv
@@ -4,3 +4,4 @@ id,version,created,notes
 3,0.0.2,2021-05-24,remove guids
 4,0.0.3,2021-05-24,general cleanup
 5,0.0.4,2021-06-17,"add custom foods tables (custom_foods, cf_dat)"
+6,0.0.5,2021-10-28,"update tables to support app (subset of original features)"
\ No newline at end of file