From 83cef61519269a2a1813bf79b50aeb1c584cc1f3 Mon Sep 17 00:00:00 2001 From: "chris.watts90@outlook.com" Date: Mon, 6 Feb 2017 22:18:37 +0000 Subject: [PATCH] Implemented some proper stubbing out method to return the defined object for testing. Time logs yet to be fully implemented. --- .../Controllers/TimelogController.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Controllers/TimelogController.cs b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Controllers/TimelogController.cs index 2c46e37..a5f8d0d 100644 --- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Controllers/TimelogController.cs +++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Controllers/TimelogController.cs @@ -1,9 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Net; +using System.Net.Http; using System.Text; using System.Threading.Tasks; using System.Web.Http; +using Interfaces; +using Newtonsoft.Json; namespace WindowsDataCenter { @@ -12,9 +16,13 @@ namespace WindowsDataCenter { [Route("")] - public IHttpActionResult GetTimeLogs([FromUri]int user, [FromUri]int calendarWeek) + public IHttpActionResult GetTimeLogs([FromUri]int userId, [FromUri]int calendarWeek) { - return Json(new List { 0, 1, 2}); + var logList = new TimeLogList(); + logList.CalendarWeek = calendarWeek; + var msg = new HttpResponseMessage(HttpStatusCode.OK); + msg.Content = new StringContent(JsonConvert.SerializeObject(logList),Encoding.UTF8, "application/json"); + return ResponseMessage(msg); } } }