@@ -94,181 +94,6 @@ public static string RenderRazorViewToString(Controller controller, string viewN
9494 }
9595 }
9696
97- /////// <summary>
98- /////// Index.
99- /////// </summary>
100- /////// <param name="learningRequest">learningRequest.</param>
101- /////// <param name="myLearningDashboard">The my learning dashboard type.</param>
102- /////// <returns>IActionResult.</returns>
103- ////[Route("MyLearning")]
104- ////[Route("MyLearning/activity")]
105- ////[HttpGet]
106- ////[HttpPost]
107- ////public async Task<IActionResult> Index(MyLearningViewModel learningRequest = null, string myLearningDashboard = null)
108- ////{
109- //// var myLearningRequestModel = new MyLearningRequestModel
110- //// {
111- //// SearchText = learningRequest.SearchText?.Trim(),
112- //// Skip = learningRequest.CurrentPageIndex * MyLearningPageSize,
113- //// Take = MyLearningPageSize,
114- //// TimePeriod = !string.IsNullOrWhiteSpace(learningRequest.TimePeriod) ? learningRequest.TimePeriod : "allDates",
115- //// StartDate = learningRequest.StartDate,
116- //// EndDate = learningRequest.EndDate,
117- //// Weblink = learningRequest.Weblink,
118- //// File = learningRequest.File,
119- //// Video = learningRequest.Video,
120- //// Article = learningRequest.Article,
121- //// Case = learningRequest.Case,
122- //// Image = learningRequest.Image,
123- //// Audio = learningRequest.Audio,
124- //// Elearning = learningRequest.Elearning,
125- //// Html = learningRequest.Html,
126- //// Assessment = learningRequest.Assessment,
127- //// Complete = learningRequest.Complete,
128- //// Incomplete = learningRequest.Incomplete,
129- //// Passed = learningRequest.Passed,
130- //// Failed = learningRequest.Failed,
131- //// Downloaded = learningRequest.Downloaded,
132- //// Viewed = learningRequest.Viewed,
133- //// Launched = learningRequest.Launched,
134- //// CertificateEnabled = learningRequest.CertificateEnabled,
135- //// };
136-
137- //// if (myLearningDashboard != null)
138- //// {
139- //// if (myLearningDashboard == "my-in-progress")
140- //// {
141- //// myLearningRequestModel.Incomplete = true;
142- //// myLearningRequestModel.Failed = true;
143- //// }
144- //// else if (myLearningDashboard == "my-recent-completed")
145- //// {
146- //// myLearningRequestModel.Complete = true;
147- //// myLearningRequestModel.Passed = true;
148- //// myLearningRequestModel.Downloaded = true;
149- //// }
150- //// else if (myLearningDashboard == "my-certificates")
151- //// {
152- //// myLearningRequestModel.CertificateEnabled = true;
153- //// myLearningRequestModel.Complete = true;
154- //// myLearningRequestModel.Passed = true;
155- //// myLearningRequestModel.Downloaded = true;
156- //// }
157- //// }
158-
159- //// switch (learningRequest.MyLearningFormActionType)
160- //// {
161- //// case MyLearningFormActionTypeEnum.NextPageChange:
162- //// learningRequest.CurrentPageIndex += 1;
163- //// myLearningRequestModel.Skip = learningRequest.CurrentPageIndex * MyLearningPageSize;
164- //// break;
165-
166- //// case MyLearningFormActionTypeEnum.PreviousPageChange:
167- //// learningRequest.CurrentPageIndex -= 1;
168- //// myLearningRequestModel.Skip = learningRequest.CurrentPageIndex * MyLearningPageSize;
169- //// break;
170- //// case MyLearningFormActionTypeEnum.BasicSearch:
171-
172- //// myLearningRequestModel = new MyLearningRequestModel
173- //// {
174- //// SearchText = learningRequest.SearchText?.Trim(),
175- //// TimePeriod = !string.IsNullOrWhiteSpace(learningRequest.TimePeriod) ? learningRequest.TimePeriod : "allDates",
176- //// Skip = learningRequest.CurrentPageIndex * MyLearningPageSize,
177- //// Take = MyLearningPageSize,
178- //// };
179- //// break;
180-
181- //// case MyLearningFormActionTypeEnum.ApplyWeekFilter:
182- //// myLearningRequestModel = new MyLearningRequestModel
183- //// {
184- //// SearchText = learningRequest.SearchText?.Trim(),
185- //// TimePeriod = "thisWeek",
186- //// Skip = learningRequest.CurrentPageIndex * MyLearningPageSize,
187- //// Take = MyLearningPageSize,
188- //// };
189- //// break;
190- //// case MyLearningFormActionTypeEnum.ApplyMonthFilter:
191- //// myLearningRequestModel = new MyLearningRequestModel
192- //// {
193- //// SearchText = learningRequest.SearchText?.Trim(),
194- //// TimePeriod = "thisMonth",
195- //// Skip = learningRequest.CurrentPageIndex * MyLearningPageSize,
196- //// Take = MyLearningPageSize,
197- //// };
198- //// break;
199-
200- //// case MyLearningFormActionTypeEnum.ApplyTwelveMonthFilter:
201- //// myLearningRequestModel = new MyLearningRequestModel
202- //// {
203- //// SearchText = learningRequest.SearchText?.Trim(),
204- //// TimePeriod = "last12Months",
205- //// Skip = learningRequest.CurrentPageIndex * MyLearningPageSize,
206- //// Take = MyLearningPageSize,
207- //// };
208- //// break;
209-
210- //// case MyLearningFormActionTypeEnum.ApplyMajorFilters:
211- //// if (learningRequest.TimePeriod == "dateRange")
212- //// {
213- //// if (!this.ModelState.IsValid)
214- //// {
215- //// break;
216- //// }
217-
218- //// myLearningRequestModel.TimePeriod = learningRequest.TimePeriod;
219- //// myLearningRequestModel.StartDate = learningRequest.GetStartDate().HasValue ? learningRequest.GetStartDate().Value : null;
220- //// myLearningRequestModel.EndDate = learningRequest.GetEndDate().HasValue ? learningRequest.GetEndDate().Value : null;
221- //// }
222-
223- //// break;
224-
225- //// case MyLearningFormActionTypeEnum.ClearAllFilters:
226-
227- //// myLearningRequestModel = new MyLearningRequestModel
228- //// {
229- //// SearchText = learningRequest.SearchText?.Trim(),
230- //// Skip = learningRequest.CurrentPageIndex * MyLearningPageSize,
231- //// TimePeriod = "allDates",
232- //// Take = MyLearningPageSize,
233- //// };
234- //// break;
235- //// }
236-
237- //// ////var result = await this.myLearningService.GetUserRecentMyLearningActivities(myLearningRequestModel);
238- //// var result = await this.myLearningService.GetActivityDetailed(myLearningRequestModel);
239- //// var response = new MyLearningViewModel(myLearningRequestModel);
240- //// if (learningRequest.TimePeriod == "dateRange")
241- //// {
242- //// response.StartDay = learningRequest.StartDay;
243- //// response.StartMonth = learningRequest.StartMonth;
244- //// response.StartYear = learningRequest.StartYear;
245- //// response.EndDay = learningRequest.EndDay;
246- //// response.EndMonth = learningRequest.EndMonth;
247- //// response.EndYear = learningRequest.EndYear;
248- //// }
249-
250- //// if (result != null)
251- //// {
252- //// response.TotalCount = result.TotalCount;
253- //// response.Activities = result.Activities.Select(entry => new ActivityDetailedItemViewModel(entry)).ToList();
254- //// if (response.Activities.Any())
255- //// {
256- //// foreach (var activity in response.Activities)
257- //// {
258- //// if (!response.MostRecentResources.Contains(activity.ResourceId))
259- //// {
260- //// activity.IsMostRecent = true;
261- //// response.MostRecentResources.Add(activity.ResourceId);
262- //// }
263- //// }
264- //// }
265- //// }
266-
267- //// response.MyLearningPaging = new MyLearningPagingModel() { CurrentPage = learningRequest.CurrentPageIndex, PageSize = MyLearningPageSize, TotalItems = response.TotalCount, HasItems = response.TotalCount > 0 };
268- //// this.ViewBag.MyLearningHelpUrl = this.Settings.SupportUrls.MyLearningHelpUrl;
269- //// return this.View(response);
270- ////}
271-
27297 /// <summary>
27398 /// Index.
27499 /// </summary>
@@ -746,11 +571,12 @@ public async Task<IActionResult> ViewProgress(int resourceId, int resourceRefere
746571 [ HttpPost ]
747572 public async Task < IActionResult > Certificates ( MyLearningUserCertificatesViewModel certificateRequest = null )
748573 {
574+ int certificatePageSize = 6 ;
749575 var myLearningRequestModel = new MyLearningRequestModel
750576 {
751577 SearchText = certificateRequest . SearchText ? . Trim ( ) ,
752- Skip = certificateRequest . CurrentPageIndex * MyLearningPageSize ,
753- Take = MyLearningPageSize ,
578+ Skip = certificateRequest . CurrentPageIndex * certificatePageSize ,
579+ Take = certificatePageSize ,
754580 File = certificateRequest . File ,
755581 Video = certificateRequest . Video ,
756582 Article = certificateRequest . Article ,
@@ -767,29 +593,29 @@ public async Task<IActionResult> Certificates(MyLearningUserCertificatesViewMode
767593 {
768594 case MyLearningFormActionTypeEnum . NextPageChange :
769595 certificateRequest . CurrentPageIndex += 1 ;
770- myLearningRequestModel . Skip = certificateRequest . CurrentPageIndex * MyLearningPageSize ;
596+ myLearningRequestModel . Skip = certificateRequest . CurrentPageIndex * certificatePageSize ;
771597 break ;
772598
773599 case MyLearningFormActionTypeEnum . PreviousPageChange :
774600 certificateRequest . CurrentPageIndex -= 1 ;
775- myLearningRequestModel . Skip = certificateRequest . CurrentPageIndex * MyLearningPageSize ;
601+ myLearningRequestModel . Skip = certificateRequest . CurrentPageIndex * certificatePageSize ;
776602 break ;
777603 case MyLearningFormActionTypeEnum . BasicSearch :
778604
779605 myLearningRequestModel = new MyLearningRequestModel
780606 {
781607 SearchText = certificateRequest . SearchText ? . Trim ( ) ,
782- Skip = certificateRequest . CurrentPageIndex * MyLearningPageSize ,
783- Take = MyLearningPageSize ,
608+ Skip = certificateRequest . CurrentPageIndex * certificatePageSize ,
609+ Take = certificatePageSize ,
784610 } ;
785611 break ;
786612 case MyLearningFormActionTypeEnum . ClearAllFilters :
787613
788614 myLearningRequestModel = new MyLearningRequestModel
789615 {
790616 SearchText = certificateRequest . SearchText ? . Trim ( ) ,
791- Skip = certificateRequest . CurrentPageIndex * MyLearningPageSize ,
792- Take = MyLearningPageSize ,
617+ Skip = certificateRequest . CurrentPageIndex * certificatePageSize ,
618+ Take = certificatePageSize ,
793619 } ;
794620 break ;
795621 }
0 commit comments