Compare commits

..

No commits in common. "e67fb5a3427f0dc2ff19d8220ca54713abe505d2" and "1e1d00d12e7e67d79b9e28c32eabb710520cecad" have entirely different histories.

5 changed files with 3 additions and 3 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Staging|Any CPU</LastActiveSolutionConfig>
<ProjectView>ProjectFiles</ProjectView>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Staging|Any CPU</LastActiveSolutionConfig>
<ProjectView>ProjectFiles</ProjectView>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />

View File

@ -408,7 +408,7 @@
</form>
</div>
<br />
@if (Model.stringval2 == "2" && (Model.stringval4 == "32" || Model.stringval4 == "108")) {
@if (Model.stringval2 == "2" && Model.stringval4 == "32") {
<p class='' style="font-weight: bold; font-size: 14pt;">※ 현재 신청중인 교육은 <span style='color: red; font-weight: bold'>집체교육 참석없이</span> 교육종료일까지 수료조건을 만족하시면 됩니다.</p>
} else if (Model.stringval2 == "2") {
<p class='' style="font-weight: bold; font-size: 14pt;">※ 현재 신청중인 교육은 <span style='color: red; font-weight: bold'>온라인교육(동영상강의28시간 + 집체참석7시간)</span> 교육입니다.</p>