main
Mel 3 years ago
parent 0b7e940d2f
commit 586c0bcb78

@ -63,6 +63,11 @@ div[data-path="05.02 Networks"] .nav-folder-title-content::before
content: "🌐 "; content: "🌐 ";
} }
div[data-path="05.03 freemind.codes"] .nav-folder-title-content::before
{
content: "👾 ";
}
div[data-path="06.01 Finances"] .nav-folder-title-content::before div[data-path="06.01 Finances"] .nav-folder-title-content::before
{ {
content: "💷 "; content: "💷 ";

@ -7,8 +7,11 @@
"id": "c1cbd199334b4022", "id": "c1cbd199334b4022",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "empty", "type": "markdown",
"state": {} "state": {
"file": "03.03 Food & Wine/!!Wine.md",
"mode": "preview"
}
} }
} }
], ],
@ -65,6 +68,7 @@
"state": { "state": {
"type": "backlink", "type": "backlink",
"state": { "state": {
"file": "03.03 Food & Wine/!!Wine.md",
"collapseAll": false, "collapseAll": false,
"extraContext": false, "extraContext": false,
"sortOrder": "alphabetical", "sortOrder": "alphabetical",
@ -103,15 +107,15 @@
}, },
"active": "c1cbd199334b4022", "active": "c1cbd199334b4022",
"lastOpenFiles": [ "lastOpenFiles": [
"Olivier Chanzy Chassagne-Montrachet 1er Cru 'Morgeot'.md", "03.03 Food & Wine/!!Wine.md",
"00.01 Admin/Templates/Template Wine.md", "03.03 Food & Wine/Aromatic Beef Pilaf.md",
"00.01 Admin/Templates/Template Travel.md", "03.03 Food & Wine/@Desserts.md",
"03.03 Food & Wine/Template Wine.md", "03.03 Food & Wine/@@Recipes.md",
"01.02 Home/MRCK.md",
"03.03 Food & Wine/Maison Olivier Chanzy Chassagne-Montrachet 1er Cru Morgeot Tête de Clos.md", "03.03 Food & Wine/Maison Olivier Chanzy Chassagne-Montrachet 1er Cru Morgeot Tête de Clos.md",
"03.03 Food & Wine/Untitled.md", "03.03 Food & Wine/@Main dishes.md",
"00.01 Admin/Templates/Template Note.md", "Untitled.md",
"03.03 Food & Wine/2015 Maison Olivier Chanzy Chassagne-Montrachet 1er Cru Morgeot Tête de Clos.md", "05.01 Computer setup/Untitled.md",
"03.03 Food & Wine/%%Wine.md", "05.01 Computer setup/Storage and Syncing.md"
"03.03 Food & Wine/$$Wine.md"
] ]
} }

@ -279,7 +279,7 @@ class globalFunc {
case 'Recipe': case 'Recipe':
switch(TableT) { switch(TableT) {
case 0: default:
TempData = ["Name", "Category", "Cuisine", "Cooking time", "Rating (1-5)"] TempData = ["Name", "Category", "Cuisine", "Cooking time", "Rating (1-5)"]
break; break;
case 'extended': case 'extended':
@ -289,6 +289,19 @@ class globalFunc {
break; break;
case 'Wine':
switch(TableT) {
default:
TempData = ["Name", "Type", "Vintage", "Country", "Terroir", "Appellation"]
break;
case 'extended':
TempData = ["Name", "Type", "Vintage", "Country", "Region", "Terroir", "Appellation", "Vineyard", "Variety", "Producer"]
break;
}
break;
} }
return TempData return TempData
@ -373,6 +386,19 @@ class globalFunc {
} }
break; break;
case 'Wine':
switch(TableT) {
default:
TempData = [p.file.link, this.GetPoint(p, DataT, "type"), this.GetPoint(p, DataT, "vintage"), this.toEmoji(this.GetPoint(p, DataT, "country")), this.GetPoint(p, DataT, "subregion"), this.GetPoint(p, DataT, "appellation")]
break;
case 'extended':
TempData = [p.file.link, this.GetPoint(p, DataT, "type"), this.GetPoint(p, DataT, "vintage"), this.toEmoji(this.GetPoint(p, DataT, "country")), this.GetPoint(p, DataT, "region"), this.GetPoint(p, DataT, "subregion"), this.GetPoint(p, DataT, "appellation"), this.GetPoint(p, DataT, "vineyard"), this.GetPoint(p, DataT, "variety"), this.GetPoint(p, DataT, "producer")]
break;
}
break;
} }
@ -399,9 +425,11 @@ class globalFunc {
switch(label) { switch(label) {
case 'French': case 'French':
case 'France':
tempresult = "🇫🇷" tempresult = "🇫🇷"
break; break;
case 'Italian': case 'Italian':
case 'Italy':
tempresult = "🇮🇹" tempresult = "🇮🇹"
break; break;
case 'British': case 'British':
@ -428,6 +456,7 @@ class globalFunc {
tempresult = "🇵🇪" tempresult = "🇵🇪"
break; break;
case 'Spanish': case 'Spanish':
case 'Spain':
tempresult = "🇪🇸" tempresult = "🇪🇸"
break; break;
case 'Greek': case 'Greek':
@ -455,6 +484,7 @@ class globalFunc {
tempresult = "🇪🇺" tempresult = "🇪🇺"
break; break;
case 'North African': case 'North African':
case 'Morroccan':
case 'North African Fusion': case 'North African Fusion':
tempresult = "🇲🇦" tempresult = "🇲🇦"
break; break;
@ -496,6 +526,7 @@ class globalFunc {
case 'placetype': case 'placetype':
case 'prodtype': case 'prodtype':
case 'disktype': case 'disktype':
case 'winetype':
result = this.GetPoint(pobj, DocType, "type") result = this.GetPoint(pobj, DocType, "type")
break; break;
case 'style': case 'style':
@ -588,6 +619,30 @@ class globalFunc {
case 'cookingtime': case 'cookingtime':
result = this.GetPoint(pobj, DocType, "cooking") result = this.GetPoint(pobj, DocType, "cooking")
break; break;
case 'vintage':
result = this.GetPoint(pobj, DocType, "vintage")
break;
case 'vineyard':
result = this.GetPoint(pobj, DocType, "vineyard")
break;
case 'terroir':
result = this.GetPoint(pobj, DocType, "subregion")
break;
case 'region':
result = this.GetPoint(pobj, DocType, "region")
break;
case 'producer':
result = this.GetPoint(pobj, DocType, "producer")
break;
case 'appellation':
result = this.GetPoint(pobj, DocType, "appellation")
break;
case 'variety':
result = this.GetPoint(pobj, DocType, "varietal")
break;
case 'designation':
result = this.GetPoint(pobj, DocType, "designation")
break;
} }
return result return result
} }
@ -858,6 +913,43 @@ class globalFunc {
} }
break; break;
case 'Wine':
switch(dPoint) {
case 'vintage':
result = pobj.Wine.Vintage
break;
case 'type':
result = pobj.Wine.Type
break;
case 'producer':
result = pobj.Wine.Producer
break;
case 'varietal':
result = pobj.Wine.Varietal
break;
case 'designation':
result = pobj.Wine.Designation
break;
case 'vineyard':
result = pobj.Wine.Vineyard
break;
case 'country':
result = pobj.Wine.Country
break;
case 'region':
result = pobj.Wine.Region
break;
case 'subregion':
result = pobj.Wine.SubRegion
break;
case 'appellation':
result = pobj.Wine.Appellation
break;
}
break;
} }
return result return result

@ -0,0 +1,6 @@
let {tableview, dateadded, winetype, vintage, producer, variety, designation, theme, country, vineyard, region, terroir, appellation} = input;
const {globalFunc} = customJS
const DataType = 'Wine'
//let templacetype = globalFunc.Get1stArg(placetype)
return globalFunc.getTable(dv, DataType, ["dateadded", "winetype", "vintage", "producer", "variety", "designation", "theme", "country", "vineyard", "region", "terroir", "appellation"], [dateadded, winetype, vintage, producer, variety, designation, theme, country, vineyard, region, terroir, appellation], tableview)

@ -101,6 +101,7 @@ Paris, Zürich, London
   
60's is their best decade 60's is their best decade
Florists: Fjura, Still Life
   

@ -1,5 +1,6 @@
--- ---
cssclass: recipeTable
Alias: ["Wine"] Alias: ["Wine"]
Tag: ["Epicure"] Tag: ["Epicure"]
Date: 2021-10-26 Date: 2021-10-26
@ -56,26 +57,34 @@ style: number
   
### Master Navigation ### Navigation
   
```dataview #### By type
Table Date as "Creation Date" from "Admin" [[#^Top|TOP]]
Sort Date ascending ##### White
 
```dataviewjs
dv.view("00.01 Admin/dv-views/query_wine", {type: "White"})
``` ```
   
--- ---
   
### Tag Navigation #### By Geography
##### France
   
```dataview ```dataviewjs
Table without id tags as "Tags" From "Admin" dv.view("00.01 Admin/dv-views/query_wine", {country: "France"})
Flatten file.tags as tags
Group by tags
``` ```
   
@ -84,13 +93,15 @@ style: number
   
### TimeStamp check ### Tag Navigation
   
```dataview ```dataview
Table TimeStamp as "Time Stamp" from "Admin" Table without id tags as "Tags" From "03.03 Food & Wine"
Where TimeStamp > date(today) - dur(100 years) Where DocType = "Wine"
Sort TimeStamp ascending Flatten file.tags as tags
Group by tags
``` ```
   
@ -105,7 +116,7 @@ style: number
```tasks ```tasks
not done not done
path includes Life Admin path includes 03.03
sort by due sort by due
hide backlink hide backlink
hide task count hide task count

@ -121,7 +121,7 @@ dv.view("00.01 Admin/dv-views/query_recipe", {course: dv.current().QueryCourse,
   
```dataview ```dataview
Table without id tags as "Tags" From "03.03 Recipes" Table without id tags as "Tags" From "03.03 Food & Wine"
Flatten file.tags as tags Flatten file.tags as tags
Group by tags Group by tags
``` ```

Loading…
Cancel
Save