diff --git a/server/AyaNova/Controllers/ReminderController.cs b/server/AyaNova/Controllers/ReminderController.cs index 7b6faa5c..3ceaae14 100644 --- a/server/AyaNova/Controllers/ReminderController.cs +++ b/server/AyaNova/Controllers/ReminderController.cs @@ -135,7 +135,7 @@ namespace AyaNova.Api.Controllers /// /// Information to display in schedule when selected for more info [HttpGet("sched-info/{id}")] - public async Task GetScheduledUserScheduleInfoView([FromRoute] long id) + public async Task GetScheduleInfoView([FromRoute] long id) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/ReviewController.cs b/server/AyaNova/Controllers/ReviewController.cs index 52d1fa87..760b64e0 100644 --- a/server/AyaNova/Controllers/ReviewController.cs +++ b/server/AyaNova/Controllers/ReviewController.cs @@ -59,29 +59,6 @@ namespace AyaNova.Api.Controllers return CreatedAtAction(nameof(ReviewController.GetReview), new { id = o.Id, version = apiVersion.ToString() }, new ApiCreatedResponse(o)); } - // /// - // /// Duplicate Review - // /// (Wiki and Attachments are not duplicated) - // /// - // /// Source object id - // /// From route path - // /// Review - // [HttpPost("duplicate/{id}")] - // public async Task DuplicateReview([FromRoute] long id, ApiVersion apiVersion) - // { - // if (!serverState.IsOpen) - // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); - // ReviewBiz biz = ReviewBiz.GetBiz(ct, HttpContext); - // if (!Authorized.HasCreateRole(HttpContext.Items, biz.BizType)) - // return StatusCode(403, new ApiNotAuthorizedResponse()); - // if (!ModelState.IsValid) - // return BadRequest(new ApiErrorResponse(ModelState)); - // Review o = await biz.DuplicateAsync(id); - // if (o == null) - // return BadRequest(new ApiErrorResponse(biz.Errors)); - // else - // return CreatedAtAction(nameof(ReviewController.GetReview), new { id = o.Id, version = apiVersion.ToString() }, new ApiCreatedResponse(o)); - // } /// /// Get Review @@ -118,7 +95,7 @@ namespace AyaNova.Api.Controllers ReviewBiz biz = ReviewBiz.GetBiz(ct, HttpContext); if (!Authorized.HasModifyRole(HttpContext.Items, biz.BizType)) return StatusCode(403, new ApiNotAuthorizedResponse()); - var o = await biz.PutAsync(updatedObject); + var o = await biz.PutAsync(updatedObject); if (o == null) { if (biz.Errors.Exists(z => z.Code == ApiErrorCode.CONCURRENCY_CONFLICT)) @@ -150,7 +127,34 @@ namespace AyaNova.Api.Controllers } + /// + /// Get Review schedule "more" info + /// + /// + /// Information to display in schedule when selected for more info + [HttpGet("sched-info/{id}")] + public async Task GetScheduleInfoView([FromRoute] long id) + { + if (!serverState.IsOpen) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); + ReviewBiz biz = ReviewBiz.GetBiz(ct, HttpContext); + if (!Authorized.HasReadFullRole(HttpContext.Items, biz.BizType)) + return StatusCode(403, new ApiNotAuthorizedResponse()); + if (!ModelState.IsValid) + return BadRequest(new ApiErrorResponse(ModelState)); + var o = await biz.GetAsync(id); + if (o == null) + return BadRequest(new ApiErrorResponse(biz.Errors)); + return Ok(ApiOkResponse.Response(new + { + o.Name, + o.Notes, + o.ReviewDate, + o.CompletedDate, + o.CompletionNotes + })); + } //------------ diff --git a/server/AyaNova/Controllers/ScheduleController.cs b/server/AyaNova/Controllers/ScheduleController.cs index 9ceb2dfc..71e3fc4c 100644 --- a/server/AyaNova/Controllers/ScheduleController.cs +++ b/server/AyaNova/Controllers/ScheduleController.cs @@ -143,7 +143,7 @@ namespace AyaNova.Api.Controllers } } break; - case AyaType.Review: + case AyaType.Review: { ReviewBiz biz = ReviewBiz.GetBiz(ct, HttpContext); var o = await biz.PutNewScheduleTimeAsync(ad);