diff --git a/BO/Controllers/BOBaseController.cs b/BO/Controllers/BOBaseController.cs index 15040f1..8615a5b 100644 --- a/BO/Controllers/BOBaseController.cs +++ b/BO/Controllers/BOBaseController.cs @@ -24,6 +24,7 @@ namespace NP.BO.Controllers ViewBag.issiteadmin = SUserInfo.IsSiteAdmin; ViewBag.ckmainlmenu = CookieGet("leftmenutoggle", "0"); ViewBag.Menus = GetMENUS.Where(w => w.usertype == base.SUserInfo.UserType).ToList(); + ViewBag.IsSubAdmin96 = SUserInfo.IsSubAdmin96; //로그인을 위해서 다 https로 돌림 if (!Request.IsSecureConnection && GetConfig("usessl") == "Y") diff --git a/BO/Views/MM/Config3.cshtml b/BO/Views/MM/Config3.cshtml index 0f84b41..5f85eed 100644 --- a/BO/Views/MM/Config3.cshtml +++ b/BO/Views/MM/Config3.cshtml @@ -26,7 +26,10 @@
  • 수정 - 삭제 + @if (false) + { + 삭제 + }
    • } diff --git a/BO/Views/cm/cmreg.cshtml b/BO/Views/cm/cmreg.cshtml index 7ec0ea0..bfb1186 100644 --- a/BO/Views/cm/cmreg.cshtml +++ b/BO/Views/cm/cmreg.cshtml @@ -2,13 +2,16 @@
    @@ -39,14 +42,14 @@
    @*
    -
    - -
    - @Html.TextBoxFor(m => m.CM.kname, new { @class = "form-control disp-init ff", @style = "width: 60%", @maxlength = "100" })
    - -
    -
    -
    *@ +
    + +
    + @Html.TextBoxFor(m => m.CM.kname, new { @class = "form-control disp-init ff", @style = "width: 60%", @maxlength = "100" })
    + +
    +
    + *@
    @{ @@ -60,7 +63,7 @@ } else { - 상시 + 상시 }
    @@ -87,20 +90,20 @@
    @Html.TextBoxFor(m => m.CM.cname, new { @class = "form-control disp-init ff", @style = "width: 50%", @maxlength = "100", @placeholder = Model.viewidxname + "명을 입력하세요." })
    @*
    -
    - -
    - @Html.TextBoxFor(m => m.CM.kname, new { @class = "form-control disp-init ff", @style = "width: 60%", @maxlength = "100" })
    - -
    -
    -
    *@ +
    + +
    + @Html.TextBoxFor(m => m.CM.kname, new { @class = "form-control disp-init ff", @style = "width: 60%", @maxlength = "100" })
    + +
    +
    + *@ }
    @Html.Partial("./Partial/Radio", Model.CM.cshape, new ViewDataDictionary() { { "valuetext", "0:온라인;1:교육장;2:온라인 혼합" }, { "checked", Model.CM.cshape }, { "name", "CM.cshape" } })
    -
    diff --git a/BO/Views/cm/cms.cshtml b/BO/Views/cm/cms.cshtml index 709f633..781c57c 100644 --- a/BO/Views/cm/cms.cshtml +++ b/BO/Views/cm/cms.cshtml @@ -173,23 +173,33 @@ { foreach (var item in Model.CMs) { - - @*@if (Model.viewidx == 0) - { - - }*@ - @item.rnorvt - @*@Html.Raw(Model.addstringval.Contains("," + item.cmno + ",") ? "" : string.Format("", item.cmno))*@ - @item.cmno - @item.tmname - @item.pcgname - @item.cgname - @item.cshapename - @item.cname (@item.classno) - @item.quotastr - @Model.Datas.Where(w => w.intval == item.cmno).Select(w => w.intval2).FirstOrDefault() - [복제] - + + @*@if (Model.viewidx == 0) + { + + }*@ + @item.rnorvt + @*@Html.Raw(Model.addstringval.Contains("," + item.cmno + ",") ? "" : string.Format("", item.cmno))*@ + @item.cmno + @item.tmname + @item.pcgname + @item.cgname + @item.cshapename + @if (!ViewBag.IsSubAdmin96) + { + @item.cname (@item.classno) + @item.quotastr + @Model.Datas.Where(w => w.intval == item.cmno).Select(w => w.intval2).FirstOrDefault() + [복제] + } + else + { + @item.cname (@item.classno) + @item.quotastr + @Model.Datas.Where(w => w.intval == item.cmno).Select(w => w.intval2).FirstOrDefault() + [복제] + } + } } else diff --git a/BO/Views/cm/ctr.cshtml b/BO/Views/cm/ctr.cshtml index 11b97b2..c9100f8 100644 --- a/BO/Views/cm/ctr.cshtml +++ b/BO/Views/cm/ctr.cshtml @@ -16,9 +16,12 @@

    diff --git a/BO/Views/cm/cts.cshtml b/BO/Views/cm/cts.cshtml index 0d26c6f..1e360b8 100644 --- a/BO/Views/cm/cts.cshtml +++ b/BO/Views/cm/cts.cshtml @@ -16,9 +16,12 @@

    @@ -74,12 +77,19 @@ @foreach (var item in Model.CTs) { - @Html.Raw(Model.addstringval.Contains("," + item.ctno + ",") ? "":string.Format("", item.ctno)) + @Html.Raw(Model.addstringval.Contains("," + item.ctno + ",") ? "" : string.Format("", item.ctno)) @item.rnorvt (@item.ctno) @item.ccode @item.cname @item.ctypename - @item.ctname + @if (!ViewBag.IsSubAdmin96) + { + @item.ctname + } + else + { + @item.ctname + } @item.udtymd2 @(item.isuse == 1 ? "Y" : "N") diff --git a/BO/Views/croom/cmlects.cshtml b/BO/Views/croom/cmlects.cshtml index ddc94a8..e1faf23 100644 --- a/BO/Views/croom/cmlects.cshtml +++ b/BO/Views/croom/cmlects.cshtml @@ -64,8 +64,11 @@    @Html.Partial("./Partial/sembtns", "#tbody1;0;1;0;0;0;교육생안내")    - 엑셀다운로드 -    + @if (!ViewBag.IsSubAdmin96) + { + 엑셀다운로드 + @Html.Raw("  "); + } 목록
    @@ -87,32 +90,64 @@ @foreach (var d in Model.Lects) { - - - @d.rnorvt - @d.asname - @(d.cnoname)(@d.cnoid) - @d.username@Html.Raw(string.IsNullOrEmpty(d.fileurl) ? "" : (" ")) - @d.cdtymd - @d.statusname - @d.pstatusname - @if (d.cshape == 2 && d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now) //혼합모드라면 + if (!ViewBag.IsSubAdmin96) { - @d.estart.ToShortDateString() + + + @d.rnorvt + @d.asname + @(d.cnoname)(@d.cnoid) + @d.username@Html.Raw(string.IsNullOrEmpty(d.fileurl) ? "" : (" ")) + @d.cdtymd + @d.statusname + @d.pstatusname + @if (d.cshape == 2 && d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now) //혼합모드라면 + { + @d.estart.ToShortDateString() + } + else + { + - + } + @if (d.cshape == 1 && d.isrebate == 1) + { + @d.isrebatename + } + else + { + - + } + } else { - - + + + @d.rnorvt + @d.asname + @(d.cnoname)(@d.cnoid) + @d.username@Html.Raw(string.IsNullOrEmpty(d.fileurl) ? "" : (" ")) + @d.cdtymd + @d.statusname + @d.pstatusname + @if (d.cshape == 2 && d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now) //혼합모드라면 + { + @d.estart.ToShortDateString() + } + else + { + - + } + @if (d.cshape == 1 && d.isrebate == 1) + { + @d.isrebatename + } + else + { + - + } + } - @if (d.cshape == 1 && d.isrebate == 1) - { - @d.isrebatename - } - else - { - - - } - } diff --git a/BO/Views/croom/grade.cshtml b/BO/Views/croom/grade.cshtml index 781cbb6..f9c3972 100644 --- a/BO/Views/croom/grade.cshtml +++ b/BO/Views/croom/grade.cshtml @@ -16,12 +16,22 @@ @Html.Partial("grade" + (Model.tabidx==2 || Model.tabidx == 3 ? 2 : Model.tabidx), Model) @Html.Partial("./Partial/DForm", Model, new ViewDataDictionary { { "preform", 1 } }) diff --git a/BO/Views/croom/grade0.cshtml b/BO/Views/croom/grade0.cshtml index 6cb6a8b..ae4f41c 100644 --- a/BO/Views/croom/grade0.cshtml +++ b/BO/Views/croom/grade0.cshtml @@ -65,12 +65,15 @@
    교육생 평가현황
    @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":전체;1:환급;0:비환급" }, { "name", "addstringval" }, { "selected", Model.addstringval }, { "style", "position: absolute; left: 0; margin-left: 50px;" + (Model.CM.isrefund == 1 ? "" : "display:none;") }, { "onchange", "findme()" } }) - @Html.Partial("./Partial/sembtns", "#tbody1;"+(Model.IsAdmin?"1;1":"0;0")+ ";1;1;0;평가안내") + @Html.Partial("./Partial/sembtns", "#tbody1;" + (Model.IsAdmin ? "1;1" : "0;0") + ";1;1;0;평가안내")     @if (Model.IsAdmin) { - 수료처리 - 강제수료처리 + 수료처리 + if (!ViewBag.IsSubAdmin96) + { + 강제수료처리 + } }     목록 @@ -109,21 +112,35 @@ @d.asname @d.usernameid @((Model.CM.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString()) - @d.attrate % + @if (!ViewBag.IsSubAdmin96) + { + @d.attrate % + } + else + { + @d.attrate % + } @( d.ex0cnt < 1 ? "-" : d.ex0lectcnt < 1 && d.ex0cnt > 0 ? "미제출" : d.ex0lectpoint.ToString()) @(d.ex1cnt < 1 ? "-" :d.ex1lectcnt < 1 && d.ex1cnt > 0 ? "미제출" : d.ex1lectpoint.ToString()) @(d.sd0cnt < 1 ? "-" :d.sd0lectcnt < 1 && d.sd0cnt > 0 ? "미제출" : d.sd0lectpoint.ToString()) @( d.sd1cnt < 1 ? "-" :d.sd1lectcnt < 1 && d.sd1cnt > 0 ? "미제출" : d.sd1lectpoint.ToString()) @*@((d.isrebate == 1 && Model.CMEV.midrfd < 1) || (d.isrebate == 0 && Model.CMEV.mid < 1) ? "-" : d.ex0cnt < 1 ? "-" : d.ex0lectcnt < 1 && d.ex0cnt > 0 ? "미제출" : d.ex0lectpoint.ToString()) - @((d.isrebate == 1 && Model.CMEV.finalrfd < 1) || (d.isrebate == 0 && Model.CMEV.final < 1) ? "-" : d.ex1cnt < 1 ? "-" : d.ex1lectcnt < 1 && d.ex1cnt > 0 ? "미제출" : d.ex1lectpoint.ToString()) - @((d.isrebate == 1 && Model.CMEV.subjectrfd < 1) || (d.isrebate == 0 && Model.CMEV.subject < 1) ? "-" : d.sd0cnt < 1 ? "-" : d.sd0lectcnt < 1 && d.sd0cnt > 0 ? "미제출" : d.sd0lectpoint.ToString()) - @((d.isrebate == 1 && Model.CMEV.discussrfd < 1) || (d.isrebate == 0 && Model.CMEV.discuss < 1) ? "-" : d.sd1cnt < 1 ? "-" : d.sd1lectcnt < 1 && d.sd1cnt > 0 ? "미제출" : d.sd1lectpoint.ToString())*@ - @if(Model.CMEV.isoffabs == 1) + @((d.isrebate == 1 && Model.CMEV.finalrfd < 1) || (d.isrebate == 0 && Model.CMEV.final < 1) ? "-" : d.ex1cnt < 1 ? "-" : d.ex1lectcnt < 1 && d.ex1cnt > 0 ? "미제출" : d.ex1lectpoint.ToString()) + @((d.isrebate == 1 && Model.CMEV.subjectrfd < 1) || (d.isrebate == 0 && Model.CMEV.subject < 1) ? "-" : d.sd0cnt < 1 ? "-" : d.sd0lectcnt < 1 && d.sd0cnt > 0 ? "미제출" : d.sd0lectpoint.ToString()) + @((d.isrebate == 1 && Model.CMEV.discussrfd < 1) || (d.isrebate == 0 && Model.CMEV.discuss < 1) ? "-" : d.sd1cnt < 1 ? "-" : d.sd1lectcnt < 1 && d.sd1cnt > 0 ? "미제출" : d.sd1lectpoint.ToString())*@ + @if (Model.CMEV.isoffabs == 1) { @(d.ispassat == 1 ? "O" : "X") } @(((d.apoint + d.mpoint + d.fpoint + d.spoint + d.dpoint)).ToString()) - @Html.Raw(d.iscomplete == 1 ? string.Format("{1}", d.lectno, "수료") : d.iscompletename) + @if (!ViewBag.IsSubAdmin96) + { + @Html.Raw(d.iscomplete == 1 ? string.Format("{1}", d.lectno, "수료") : d.iscompletename) + } + else + { + @Html.Raw(d.iscomplete == 1 ? string.Format("{1}", d.lectno, "수료") : d.iscompletename) + } 변경 } diff --git a/BO/Views/croom/grade1.cshtml b/BO/Views/croom/grade1.cshtml index 0bd3f76..86cc567 100644 --- a/BO/Views/croom/grade1.cshtml +++ b/BO/Views/croom/grade1.cshtml @@ -3,14 +3,17 @@
    @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":전체;1:환급;0:비관급" }, { "name", "addstringval" }, { "selected", Model.addstringval }, { "style", "position: absolute; left: 0; margin-left: 50px;" + (Model.CM.isrefund == 1 ? "" : "display:none;") }, { "onchange", "findme()" } }) - @Html.Partial("./Partial/sembtns", "#tbody1;"+(Model.IsAdmin?"1;1":"0;0")+ ";1;1;0;평가안내") + @Html.Partial("./Partial/sembtns", "#tbody1;" + (Model.IsAdmin ? "1;1" : "0;0") + ";1;1;0;평가안내")     - @if (Model.IsAdmin) + @if (!ViewBag.IsSubAdmin96) { - 출석완료처리 + if (Model.IsAdmin) + { + 출석완료처리 + } + OFF출결관리 + @Html.Raw("   "); } - OFF출결관리 -     목록
    diff --git a/Model/Users.cs b/Model/Users.cs index 42b5b5b..2df9f07 100644 --- a/Model/Users.cs +++ b/Model/Users.cs @@ -299,6 +299,10 @@ namespace NP.Model /// 강사 /// public bool IsTeacher{ get { return UserType == 11; } } + /// + /// 관리자(usertype:96) + /// + public bool IsSubAdmin96 { get { return UserType == 96; } } } ///