diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 61656b3..fec3533 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -759,11 +759,24 @@ namespace NP.BO.Controllers public ActionResult atts(VMLect vm) { + vm.pagerowcount = 10; // 한 페이지에 보이는 로우 수 + + var ht = SetHash(vm); + vm.Lect = Dao.Get("lect.lects", new System.Collections.Hashtable() { { "lectno", vm.longval } }).First(); - vm.LectInningPages = Dao.Get("lect.lectinningpages", new System.Collections.Hashtable() { { "lectno", vm.Lect.lectno },{"isscd", 0} }); + + ht.Add("lectno", vm.Lect.lectno); + ht.Add("isscd", 0); + + //vm.LectInningPages = Dao.Get("lect.lectinningpages", new System.Collections.Hashtable() { { "lectno", vm.Lect.lectno },{"isscd", 0} }); + vm.LectInningPages = Dao.Get("lect.lectinningpages", ht); + + vm.pagetotalcount = GetCount(vm.LectInningPages.FirstOrDefault()); + // [이슈_602 / 박상완] 활동이력 탭에서 '검색' 시 데이터 로드 할 수 있도록 변경 // 파라미터 userno 를 -1으로 변경 vm.PageLogs = Dao.Get("lect.pagelogs", new System.Collections.Hashtable() { { "start", vm.Lect.sstime }, { "end", vm.Lect.setime.Value.ToString("yyyy-MM-dd 23:59:59") }, { "userno", -1 }, { "logsite", 1 } }); + // [이슈_602 / 박상완] YYYY-MM-DD 로 검색하는 부분을 조회일 하루로 기본값 부탁드립니다. 예) 오늘 조회 시 : 2021-12-27 ~ 2021-12-27 vm.Lect.sstime = DateTime.Now; // (검색) 시작일 - 현재시간 diff --git a/BO/Views/croom/atts.cshtml b/BO/Views/croom/atts.cshtml index daed9ea..2f5bdc5 100644 --- a/BO/Views/croom/atts.cshtml +++ b/BO/Views/croom/atts.cshtml @@ -26,73 +26,77 @@ -@foreach(var iseq in Model.LectInningPages.Select(s=>s.iseq).Distinct()) + @foreach (var iseq in Model.LectInningPages.Select(s => s.iseq).Distinct()) + { + var inning = Model.LectInningPages.Where(w => w.iseq == iseq).First(); + + @inning.iseq + @inning.isonlinename2 + @inning.ititle + @inning.atimename + + @if (inning.isonline == 1 && inning.istatus != null@*&& inning.cpno > 0*@) { - var inning = Model.LectInningPages.Where(w => w.iseq == iseq).First(); - - @inning.iseq - @inning.isonlinename2 - @inning.ititle - @inning.atimename - - @if (inning.isonline == 1 && inning.istatus != null @*&& inning.cpno > 0*@) - { - @inning.litotstudymin 분 - } - else - { - @:- - } - - @inning.listimeymdhms
@string.Format("({0}|{1})", inning.liispcsname, inning.lisips) - @inning.lietimeymdhms
@string.Format("({0})", inning.lieips) - - @if (inning.isonline == 1 && ((inning.istatus == 0 || inning.istatus == 1) || (inning.istatus==2 && inning.statustime != null))) - { - @inning.istatusname - } - else - { - @inning.istatusname - } - - - if (inning.isonline == 1 && inning.istatus != null/* && inning.cpno > 0*/) - { - var innings = Model.LectInningPages.Where(w => w.iseq == iseq); - -   - -
    - @foreach (var d in innings) - { -
  • @string.Format("{0}분 ({1})", d.totstudymin, d.pseqname)
    • - } -
- - -
    - @foreach (var d in innings) - { -
  • @d.stimeymdhms
    @string.Format("({0}|{1})", d.ispcsname, d.sip)
    • - } -
- - -
    - @foreach (var d in innings) - { -
  • @d.etimeymdhms
    @string.Format("({0})", d.eip)
    • - } -
- -   - - } + @inning.litotstudymin 분 } +else +{ + @:- +} + + @inning.listimeymdhms
@string.Format("({0}|{1})", inning.liispcsname, inning.lisips) + @inning.lietimeymdhms
@string.Format("({0})", inning.lieips) + + @if (inning.isonline == 1 && ((inning.istatus == 0 || inning.istatus == 1) || (inning.istatus == 2 && inning.statustime != null))) + { + @inning.istatusname + } + else + { + @inning.istatusname + } + + + + if (inning.isonline == 1 && inning.istatus != null/* && inning.cpno > 0*/) + { + var innings = Model.LectInningPages.Where(w => w.iseq == iseq); + +   + +
    + @foreach (var d in innings) + { +
  • @string.Format("{0}분 ({1})", d.totstudymin, d.pseqname)
    • + } +
+ + +
    + @foreach (var d in innings) + { +
  • @d.stimeymdhms
    @string.Format("({0}|{1})", d.ispcsname, d.sip)
    • + } +
+ + +
    + @foreach (var d in innings) + { +
  • @d.etimeymdhms
    @string.Format("({0})", d.eip)
    • + } +
+ +   + + } + } +
+ @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount) +