Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dfd1c59554 | ||
|
|
83b70073e9 | ||
|
|
11025cc39a | ||
|
|
fb908a1cef | ||
|
|
6a6f7b35c7 |
@@ -126,8 +126,8 @@ module Data =
|
|||||||
.ToListAsync()
|
.ToListAsync()
|
||||||
return
|
return
|
||||||
jrnl
|
jrnl
|
||||||
|
|> Seq.map (fun r -> r.history <- []; r.notes <- []; r)
|
||||||
|> List.ofSeq
|
|> List.ofSeq
|
||||||
|> List.map (fun r -> r.history <- []; r.notes <- []; r)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Save changes in the current document session
|
/// Save changes in the current document session
|
||||||
@@ -166,7 +166,9 @@ module Data =
|
|||||||
.Where(fun x -> x.Id = (RequestId.toString reqId) && x.userId = userId)
|
.Where(fun x -> x.Id = (RequestId.toString reqId) && x.userId = userId)
|
||||||
.ProjectInto<JournalRequest>()
|
.ProjectInto<JournalRequest>()
|
||||||
.FirstOrDefaultAsync ()
|
.FirstOrDefaultAsync ()
|
||||||
return Option.fromObject req
|
return
|
||||||
|
Option.fromObject req
|
||||||
|
|> Option.map (fun r -> r.history <- []; r.notes <- []; r)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Update the recurrence for a request
|
/// Update the recurrence for a request
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||||
<Version>2.1.0.0</Version>
|
<Version>2.1.4.0</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -14,17 +14,17 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="FunctionalCuid" Version="1.0.0" />
|
<PackageReference Include="FunctionalCuid" Version="1.0.0" />
|
||||||
<PackageReference Include="Giraffe" Version="3.6.0" />
|
<PackageReference Include="Giraffe" Version="4.1.0" />
|
||||||
<PackageReference Include="Giraffe.TokenRouter" Version="1.0.0" />
|
<PackageReference Include="Giraffe.TokenRouter" Version="1.0.0" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.0.0" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.3" />
|
||||||
<PackageReference Include="Microsoft.FSharpLu" Version="0.10.29" />
|
<PackageReference Include="Microsoft.FSharpLu" Version="0.11.6" />
|
||||||
<PackageReference Include="Microsoft.FSharpLu.Json" Version="0.10.29" />
|
<PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.6" />
|
||||||
<PackageReference Include="RavenDb.Client" Version="4.2.1" />
|
<PackageReference Include="RavenDb.Client" Version="4.2.102" />
|
||||||
<PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
|
<PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Update="FSharp.Core" Version="4.7.0" />
|
<PackageReference Update="FSharp.Core" Version="4.7.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "my-prayer-journal",
|
"name": "my-prayer-journal",
|
||||||
"version": "2.1.0",
|
"version": "2.1.4",
|
||||||
"description": "myPrayerJournal - Front End",
|
"description": "myPrayerJournal - Front End",
|
||||||
"author": "Daniel J. Summers <daniel@bitbadger.solutions>",
|
"author": "Daniel J. Summers <daniel@bitbadger.solutions>",
|
||||||
"private": true,
|
"private": true,
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
"publish": "vue-cli-service build --modern && cd ../MyPrayerJournal.Api && dotnet publish -c Release -r linux-x64 --self-contained false"
|
"publish": "vue-cli-service build --modern && cd ../MyPrayerJournal.Api && dotnet publish -c Release -r linux-x64 --self-contained false"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"auth0-js": "^9.7.3",
|
"auth0-js": "^9.13.2",
|
||||||
"axios": "^0.19.0",
|
"axios": "^0.19.0",
|
||||||
"moment": "^2.18.1",
|
"moment": "^2.18.1",
|
||||||
"vue": "^2.5.15",
|
"vue": "^2.5.15",
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ md-dialog(:md-active.sync='notesVisible').mpj-note-dialog
|
|||||||
md-dialog-actions
|
md-dialog-actions
|
||||||
md-button(@click='saveNotes()').md-primary #[md-icon save] Save
|
md-button(@click='saveNotes()').md-primary #[md-icon save] Save
|
||||||
md-button(@click='closeDialog()') #[md-icon undo] Cancel
|
md-button(@click='closeDialog()') #[md-icon undo] Cancel
|
||||||
.mpj-dialog-content
|
md-dialog-content(md-scrollbar='true').mpj-dialog-content
|
||||||
div(v-if='hasPriorNotes')
|
div(v-if='hasPriorNotes')
|
||||||
p.mpj-text-center: strong Prior Notes for This Request
|
p.mpj-text-center: strong Prior Notes for This Request
|
||||||
.mpj-note-list
|
.mpj-note-list
|
||||||
@@ -71,7 +71,7 @@ export default {
|
|||||||
this.progress.$emit('show', 'indeterminate')
|
this.progress.$emit('show', 'indeterminate')
|
||||||
try {
|
try {
|
||||||
const notes = await api.getNotes(this.form.requestId)
|
const notes = await api.getNotes(this.form.requestId)
|
||||||
this.priorNotes = notes.data
|
this.priorNotes = notes.data.sort((a, b) => b.asOf - a.asOf)
|
||||||
this.progress.$emit('done')
|
this.progress.$emit('done')
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error(e)
|
console.error(e)
|
||||||
|
|||||||
3164
src/app/yarn.lock
3164
src/app/yarn.lock
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user