Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin.git into develop

src/main/java/com/style24/admin/biz/service/TsaMorebetterService.java

@@ -225,10 +225,11 @@ public class TsaMorebetterService {
         MoreBetterGoods moreBetterGoods = new MoreBetterGoods();
         StringBuilder sb = new StringBuilder();
         //int i = 1;
-        if(moreBetter.getApplyGoodsList().size()>0){
-            for(int i=0; i<moreBetter.getApplyGoodsList().size(); i++){
-                sb.append("SELECT   '").append(moreBetter.getApplyGoodsList().get(i).getGoodsCd()).append("' AS GOODS_CD ");
-                if(i<moreBetter.getApplyGoodsList().size()-1){
+
+        if(moreBetter.getGridApplyGoodsList().size()>0){    //getApplyGoodsList
+            for(int i=0; i<moreBetter.getGridApplyGoodsList().size(); i++){
+                sb.append("SELECT   '").append(moreBetter.getGridApplyGoodsList().get(i).getGoodsCd()).append("' AS GOODS_CD ");
+                if(i<moreBetter.getGridApplyGoodsList().size()-1){
                     sb.append("\n UNION ALL \n");
                 }
             }

src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -166,109 +166,108 @@
 				}
 			}
 			if(contentsLoc=='SGNB001'){
+				var src = '';
+				var src2 = '';
 				html += '<tr class="cateTypeTr">';
 				html += '	<th>유형선택</th>';
 				html += '	<td colspan="3">';
+				html += '		<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="OPEN" onclick="fnChangeGnbCateType(this,'+i+');"';
 				if(result[i].contentsType=='OPEN'){
-					html += '		<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="OPEN" onclick="fnChangeGnbCateType(this,'+i+');" checked="checked"/>오픈배너</label>';
-					html += '		<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="IMG" onclick="fnChangeGnbCateType(this,'+i+');" />이미지배너</label>';
-					html += '		<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="TEXT" onclick="fnChangeGnbCateType(this,'+i+');" />텍스트배너</label>';
-				}else if(result[i].contentsType=='IMG'){
-					html += '		<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="OPEN" onclick="fnChangeGnbCateType(this,'+i+');" />오픈배너</label>';
-					html += '		<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="IMG" onclick="fnChangeGnbCateType(this,'+i+');" checked="checked"/>이미지배너</label>';
-					html += '		<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="TEXT" onclick="fnChangeGnbCateType(this,'+i+');" />텍스트배너</label>';
-				}else{
-					html += '		<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="OPEN" onclick="fnChangeGnbCateType(this,'+i+');" />오픈배너</label>';
-					html += '		<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="IMG" onclick="fnChangeGnbCateType(this,'+i+');" />이미지배너</label>';
-					html += '		<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="TEXT" onclick="fnChangeGnbCateType(this,'+i+');" checked="checked"/>텍스트배너</label>';
+					html += ' checked="checked" ';
+				}
+				html += '/>오픈배너</label>';
+				html += '		<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="IMG" onclick="fnChangeGnbCateType(this,'+i+');" ';
+				if(result[i].contentsType=='IMG'){
+					html += ' checked="checked" ';
+				}
+				html += '/>이미지배너</label>';
+				html += '		<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="TEXT" onclick="fnChangeGnbCateType(this,'+i+');" ';
+				if(result[i].contentsType=='TEXT'){
+					html += ' checked="checked" ';
 				}
+				html += '/>텍스트배너</label>';
 				html += '	</td>';
 				html += '</tr>';
 
-				if(result[i].contentsType=='OPEN'){
-					var src = $("#uploadDefaultUrlPop").val().replace('/contents/', '')+result[i].imgPath1;
-					var src2 = $("#uploadDefaultUrlPop").val().replace('/contents/', '')+result[i].imgPath2;
-					html += '<tr name="imgPopRow" id="openBanner0">';
-					html += '	<th>띠배너<br>이미지</th>';
-					html += '	<td><div class="uFile w300">';
-					html += '			<input id="filePop_0" name="file" type="file" class="uFileInput w300" onchange="fnPopFileUpload(this, 0)"/>';
-					html += '			<label for="filePop_0" class="uFileLabel">파일선택</label>';
-					html += '			<input type="hidden" name="imgPath" value="'+result[i].imgPath1+'"/>';
-					html += '			<input type="hidden" name="newImgFile" value="" />';
-					html += '		</div>';
-					html += '	<div id="imgViewPop_0" class=';
-					if(src!=''){
-						html += '"on">';
-					}else{
-						html += '"off">';
-					}
-					html += '		<img id="bannerPreViewUrlPop_0" src="'+src+'" style="height:100px; max-width:500px;"  onclick="cfnOpenImagePreViewPopup(\'bannerPreimgViewPop\',$(this).attr(\'src\'));"/>';
-					html += '	</div></td>';
-					html += '</tr>';
+				if(!gagajf.isNull(result[i].imgPath1)){
+					src = $("#uploadDefaultUrlPop").val().replace('/contents/', '')+result[i].imgPath1;
+					src2 = $("#uploadDefaultUrlPop").val().replace('/contents/', '')+result[i].imgPath2;
+				}
+				console.log('src::'+src);
 
-					html += '<tr class="cateTypeTr" name="openBannerTypeTr'+i+'" id="openBannerTypeTr">';
-					html += '	<th>확장형 배너<br>유형</th>';
-					html += '	<td colspan="3">';
-					if(result[i].strVar7=='IMG'){
-						html += '		<label class="rdoBtn"><input type="radio" name="openBannerType'+i+'" value="IMG" onclick="fnChangeOpenBannerType(this,'+i+');" checked="checked"/>이미지형</label>';
-						html += '		<label class="rdoBtn"><input type="radio" name="openBannerType'+i+'" value="HTML" onclick="fnChangeOpenBannerType(this,'+i+');"/>HTML형</label>';
-					}else{
-						html += '		<label class="rdoBtn"><input type="radio" name="openBannerType'+i+'" value="IMG" onclick="fnChangeOpenBannerType(this,'+i+');" />이미지형</label>';
-						html += '		<label class="rdoBtn"><input type="radio" name="openBannerType'+i+'" value="HTML" onclick="fnChangeOpenBannerType(this,'+i+');" checked="checked"/>HTML형</label>';
-					}
-					html += '	</td>';
-					html += '</tr>';
+				html += '<tr name="imgPopRow" id="openBanner0" ';
+				if(result[i].contentsType=='TEXT'){
+					html += '	style="display:none;"';
+				}
+				html += '>';
+				html += '	<th>띠배너<br>이미지</th>';
+				html += '	<td><div class="uFile w300">';
+				html += '			<input id="filePop_0" name="file" type="file" class="uFileInput w300" onchange="fnPopFileUpload(this, 0)"/>';
+				html += '			<label for="filePop_0" class="uFileLabel">파일선택</label>';
+				html += '			<input type="hidden" name="imgPath" value="'+result[i].imgPath1+'"/>';
+				html += '			<input type="hidden" name="newImgFile" value="" />';
+				html += '		</div>';
+				html += '	<div id="imgViewPop_0" class=';
+				if(src!=''){
+					html += '"on">';
+				}else{
+					html += '"off">';
+				}
+				html += '		<img id="bannerPreViewUrlPop_0" src="'+src+'" style="height:100px; max-width:500px;"  onclick="cfnOpenImagePreViewPopup(\'bannerPreimgViewPop\',$(this).attr(\'src\'));"/>';
+				html += '	</div></td>';
+				html += '</tr>';
 
-					if(result[i].strVar7=='IMG'){
-						html += '<tr name="imgPopRow" id="openBanner1">';
-						html += '	<th>오픈배너<br>이미지</th>';
-						html += '	<td><div class="uFile w300">';
-						html += '			<input id="filePop_1" name="file" type="file" class="uFileInput w300" onchange="fnPopFileUpload(this, 1)"/>';
-						html += '			<label for="filePop_1" class="uFileLabel">파일선택</label>';
-						html += '			<input type="hidden" name="imgPath" value="'+result[i].imgPath2+'"/>';
-						html += '			<input type="hidden" name="newImgFile" value="" />';
-						html += '		</div>';
-						html += '	<div id="imgViewPop_1" class=';
-						if(src!=''){
-							html += '"on">';
-						}else{
-							html += '"off">';
-						}
-						html += '		<img id="bannerPreViewUrlPop_1" src="'+src2+'" style="height:100px; max-width:500px;"  onclick="cfnOpenImagePreViewPopup(\'bannerPreimgViewPop\',$(this).attr(\'src2\'));"/>';
-						html += '	</div></td>';
-						html += '</tr>';
-					}else{
-						html += '<tr name="imgPopRow" id="openBanner2">';
-						html += '	<input type="hidden" name="htmlDesc'+i+'" id="htmlDesc'+i+'" value="'+result[i].html+'">';
-						html += '	<th>오픈배너<br>HTML</th>';
-						html += '	<td class="padT10"><div class="tabJrContArea">';
-						html += '		<textarea class="textareaR3 summernote" name="openBannerDesc'+i+'" id="openBannerDesc'+i+'" ></textarea>';
-						html += '	</div>';
-						html += '	</td>';
-						html += '</tr>';
-					}
+				html += '<tr class="cateTypeTr" name="openBannerTypeTr'+i+'" id="openBannerTypeTr" ';
+				if(result[i].contentsType!='OPEN'){
+					html += '	style="display:none;"';
+				}
+				html += '>';
+				html += '	<th>확장형 배너<br>유형</th>';
+				html += '	<td colspan="3">';
+				if(result[i].strVar7=='IMG'){
+					html += '		<label class="rdoBtn"><input type="radio" name="openBannerType'+i+'" value="IMG" onclick="fnChangeOpenBannerType(this,'+i+');" checked="checked"/>이미지형</label>';
+					html += '		<label class="rdoBtn"><input type="radio" name="openBannerType'+i+'" value="HTML" onclick="fnChangeOpenBannerType(this,'+i+');"/>HTML형</label>';
+				}else{
+					html += '		<label class="rdoBtn"><input type="radio" name="openBannerType'+i+'" value="IMG" onclick="fnChangeOpenBannerType(this,'+i+');" />이미지형</label>';
+					html += '		<label class="rdoBtn"><input type="radio" name="openBannerType'+i+'" value="HTML" onclick="fnChangeOpenBannerType(this,'+i+');" checked="checked"/>HTML형</label>';
 				}
+				html += '	</td>';
+				html += '</tr>';
 
-				if(result[i].contentsType=='IMG'){
-					var src = $("#uploadDefaultUrlPop").val().replace('/contents/', '')+result[i].imgPath1;
-					html += '<tr name="imgPopRow" id="openBanner0">';
-					html += '	<th>띠배너<br>이미지</th>';
-					html += '	<td><div class="uFile w300">';
-					html += '			<input id="filePop_0" name="file" type="file" class="uFileInput w300" onchange="fnPopFileUpload(this, 0)"/>';
-					html += '			<label for="filePop_0" class="uFileLabel">파일선택</label>';
-					html += '			<input type="hidden" name="imgPath" value="'+result[i].imgPath1+'"/>';
-					html += '			<input type="hidden" name="newImgFile" value="" />';
-					html += '		</div>';
-					html += '	<div id="imgViewPop_0" class=';
-					if(src!=''){
-						html += '"on">';
-					}else{
-						html += '"off">';
-					}
-					html += '		<img id="bannerPreViewUrlPop_0" src="'+src+'" style="height:100px; max-width:500px;"  onclick="cfnOpenImagePreViewPopup(\'bannerPreimgViewPop\',$(this).attr(\'src\'));"/>';
-					html += '	</div></td>';
-					html += '</tr>';
+				html += '<tr name="imgPopRow" id="openBanner1" ';
+				if(result[i].contentsType!='OPEN' && result[i].strVar7!='IMG'){
+					html += '	style="display:none;"';
+				}
+				html +='>';
+				html += '	<th>오픈배너<br>이미지</th>';
+				html += '	<td><div class="uFile w300">';
+				html += '			<input id="filePop_1" name="file" type="file" class="uFileInput w300" onchange="fnPopFileUpload(this, 1)"/>';
+				html += '			<label for="filePop_1" class="uFileLabel">파일선택</label>';
+				html += '			<input type="hidden" name="imgPath" value="'+result[i].imgPath2+'"/>';
+				html += '			<input type="hidden" name="newImgFile" value="" />';
+				html += '		</div>';
+				html += '	<div id="imgViewPop_1" class=';
+				if(src!=''){
+					html += '"on">';
+				}else{
+					html += '"off">';
 				}
+				html += '		<img id="bannerPreViewUrlPop_1" src="'+src2+'" style="height:100px; max-width:500px;"  onclick="cfnOpenImagePreViewPopup(\'bannerPreimgViewPop\',$(this).attr(\'src2\'));"/>';
+				html += '	</div></td>';
+				html += '</tr>';
+
+				html += '<tr name="imgPopRow" id="openBanner2" ';
+				if(result[i].contentsType!='OPEN' || result[i].strVar7!='HTML'){
+					html += '	style="display:none;"';
+				}
+				html += '>';
+				html += '	<input type="hidden" name="htmlDesc'+i+'" id="htmlDesc'+i+'" value="'+result[i].html+'">';
+				html += '	<th>오픈배너<br>HTML</th>';
+				html += '	<td class="padT10"><div class="tabJrContArea">';
+				html += '		<textarea class="textareaR3 summernote" name="openBannerDesc'+i+'" id="openBannerDesc'+i+'" ></textarea>';
+				html += '	</div>';
+				html += '	</td>';
+				html += '</tr>';
 
 				html += '	<tr name="tabBgColorRow'+i+'"';
 				if(result[i].contentsType=='TEXT'){
@@ -376,24 +375,6 @@
 					html += '	</td>';
 					html += '</tr>';
 			}
-			if(contentsLoc=='STAB003'){
-				html += '	<tr name="tabCateRow">';
-				html += '		<th>카테고리</th>';
-				html += '		<td colspan="3">카테고리선택';
-				html += '			<select name="cate1List">';
-				html += '				<option value="">[선택]</option>';
-				for(let i=0; i<cate1List.length; i++){
-					if(cate1No == cate1List[i].cd){
-						html += '<option value="'+cate1List[i].cd+'" selected="selected">['+cate1List[i].cd+'] '+cate1List[i].cdNm+'</option>';
-					}else{
-						html += '<option value="'+cate1List[i].cd+'">['+cate1List[i].cd+'] '+cate1List[i].cdNm+'</option>';
-					}
-				}
-				html += '				<option value="3000">[3000] 아울렛</option>';
-				html += '			</select>';
-				html += '		</td>';
-				html += '	</tr>';
-			}
 			html += '</thead><tbody>';
 			if(contentsLoc!='SCM002' && contentsLoc!='SCM003' && contentsLoc!='SMM011' && contentsLoc!='SBM012'){
 				for(var j=1; j<5; j++){
@@ -442,14 +423,17 @@
 			let idx = $(this).find('[name=tableIdx]').val();
 			let bannerCateType = $("#mcTable"+idx).find('input:radio[name=cateType'+idx+']:checked').val();
 
-			if(bannerCateType=='OPEN'){
-				let bannerType = $("#mcTable"+idx).find('input:radio[name=openBannerType'+idx+']:checked').val();
-				if(bannerType=='HTML'){
-					let htmlDesc = $("#mcTable"+idx).find('input[name=htmlDesc'+idx+']').val();
-					gagaSn.setContents('#openBannerDesc'+idx, '');
-					$('#openBannerDesc'+idx).summernote('code', htmlDesc);
-				}
-			}
+			// if(bannerCateType=='OPEN'){
+			// 	let bannerType = $("#mcTable"+idx).find('input:radio[name=openBannerType'+idx+']:checked').val();
+			// 	if(bannerType=='HTML'){
+			// 		let htmlDesc = $("#mcTable"+idx).find('input[name=htmlDesc'+idx+']').val();
+			// 		gagaSn.setContents('#openBannerDesc'+idx, '');
+			// 		$('#openBannerDesc'+idx).summernote('code', htmlDesc);
+			// 	}
+			// }
+			let htmlDesc = $("#mcTable"+idx).find('input[name=htmlDesc'+idx+']').val();
+			gagaSn.setContents('#openBannerDesc'+idx, '');
+			$('#openBannerDesc'+idx).summernote('code', htmlDesc);
 		});
 	}
 
@@ -515,7 +499,7 @@
 			$(obj).closest("table").find("[name=tabShowYnRow"+idx+"]").hide();
 			$(obj).closest("table").find("[name=openBannerTypeTr"+idx+"]").hide();
 			$(obj).closest("table").find("input:radio[name=openBannerType"+idx+"]:input[value=IMG]").prop('checked',true);
-			$(obj).closest("table").find("[id=openBanner0]").show();
+			$(obj).closest("table").find("[id=openBanner0]").hide();
 			$(obj).closest("table").find("[id=openBanner1]").hide();
 			$(obj).closest("table").find("[id=openBanner2]").hide();
 			$(obj).closest("table").find("[name=file]").closest('div').find('label').text('파일선택');
@@ -738,20 +722,6 @@
 			html += '	</td>';
 			html += '</tr>';
 		}
-		if(contentsLoc=='STAB003'){
-			html += '	<tr name="tabCateRow">';
-			html += '		<th>카테고리</th>';
-			html += '		<td colspan="3">카테고리선택';
-			html += '			<select name="cate1List">';
-			html += '				<option value="">[선택]</option>';
-			for(let i=0; i<cate1List.length; i++){
-				html += '<option value="'+cate1List[i].cd+'">['+cate1List[i].cd+'] '+cate1List[i].cdNm+'</option>';
-			}
-			html += '				<option value="3000">[3000] 아울렛</option>';
-			html += '			</select>';
-			html += '		</td>';
-			html += '	</tr>';
-		}
 		html += '</thead><tbody>';
 		html += '</tbody></table>';
 
@@ -848,20 +818,6 @@
 		return true;
 	}
 
-	// STAB003 데이터 validation 체크
-	function stab003DataValidation(){
-		$(".mcTable").each(function(i){
-			var cateValue = $(this).find("tr[name=tabCateRow]").find("select[name=cate1List] option:selected").val();
-			console.log('cateValue::'+cateValue);
-			if(gagajf.isNull(cateValue)){
-				mcxDialog.alert('적용할 카테고리를 선택해주세요.');
-				return false;
-			}
-		});
-
-		return true;
-	}
-
 	/**
 	 * 임시저장
 	 */
@@ -877,12 +833,6 @@
 			}
 		}
 
-		if(contentsLoc=='STAB003'){
-			if(!stab003DataValidation()){
-				return false;
-			}
-		}
-
 		var titleBool = true;
 		$("#popSortable").find('input[name=title]').each(function(idx, title) {
 			if ($(title).val()==''){
@@ -999,11 +949,6 @@
 				strVar1 = $(this).find("input:radio[name=dispCnt]:checked").val();
 			}
 
-			if(contentsLoc=='STAB003'){
-				var cateValue = $(this).find("tr[name=tabCateRow]").find("select[name=cate1List] option:selected").val();
-				contentsType = cateValue;
-			}
-
 			var data = {cateNo : cateNo
 				, contentsLoc : contentsLoc
 				, contentsType : contentsType

src/main/webapp/WEB-INF/views/display/MainListForm.html

@@ -29,12 +29,12 @@
 		<div class="panelStyle">
 			<form id="searchForm" name="searchForm" action="#">
 				<table class="frmStyle">
-					<colgroup>
-						<col style="width: 25%;"/>
-						<col style="width: 25%;"/>
-						<col style="width: 25%;"/>
-						<col style="width: 25%;"/>
-					</colgroup>
+<!--					<colgroup>-->
+<!--						<col style="width: 25%;"/>-->
+<!--						<col style="width: 25%;"/>-->
+<!--						<col style="width: 25%;"/>-->
+<!--						<col style="width: 25%;"/>-->
+<!--					</colgroup>-->
 					<tr>
 						<th>대분류</th>
 						<td>
@@ -266,10 +266,13 @@
 				html += colspan;
 			}
 
-			var maxWidth = parseInt(tdWidth/Number(colCnt), 10);
-			if(colCnt>5){
-				maxWidth = parseInt(tdWidth/(Number(colCnt)/tdSize), 10);
+			let maxWidth = parseInt(tdWidth/Number(colCnt), 10);
+			if(maxWidth == 0){
+				maxWidth = 800;
 			}
+			// if(colCnt>5){
+			// 	maxWidth = parseInt(tdWidth/(Number(colCnt)/tdSize), 10);
+			// }
 			html += '" style="text-align:center; max-width:'+maxWidth+'px;">';
 			html += '<div><span style="font-weight:bold">'+result[i].contentsLoc+'</span></div><div><span>[ '+gagaAgGrid.lookupValue(contentsLocArr, result[i].contentsLoc)+' ]</span></div>';
 			html += '<input type="text" class="w200" name="contentsTitle" placeholder="메인타이틀" value="'+result[i].contentsTitle+'"/>';
@@ -406,14 +409,12 @@
 			contentsLocHtml += '<option value="SGNB001">[SGNB001] STYLE24MALL > GNB > TOP배너</option>';
 			contentsLocHtml += '<option value="STAB001">[STAB001] STYLE24MALL > GNB > 브랜드</option>';
 			contentsLocHtml += '<option value="STAB002">[STAB002] STYLE24MALL > GNB > 카테고리</option>';
-			contentsLocHtml += '<option value="STAB003">[STAB003] STYLE24MALL > GNB > 기획전배너</option>';
 			contentsLocHtml += '<option value="SKEY001">[SKEY001] STYLE24MALL > GNB > 검색어</option>';
 		}
 		if(cate1No=='1720'){
 			contentsLocHtml += '<option value="SGNB002">[SGNB001] STYLE24MALL > GNB > TOP배너(모바일)</option>';
 			contentsLocHtml += '<option value="STAB001">[STAB001] STYLE24MALL > GNB > 브랜드</option>';
 			contentsLocHtml += '<option value="STAB002">[STAB002] STYLE24MALL > GNB > 카테고리</option>';
-			contentsLocHtml += '<option value="STAB003">[STAB003] STYLE24MALL > GNB > 기획전배너</option>';
 			contentsLocHtml += '<option value="SKEY001">[SKEY001] STYLE24MALL > GNB > 검색어</option>';
 		}
 		for(var i=0; i<contentsLocList.length; i++){
@@ -776,7 +777,7 @@
 		if(val.split(',')[1]=='Y'){
 			if(val.split(',')[0]=='1711' || val.split(',')[0]=='1721'){
 				cate1No = '2100';
-			}if(val.split(',')[0]=='1713' || val.split(',')[0]=='1723'){
+			}else if(val.split(',')[0]=='1713' || val.split(',')[0]=='1723'){
 				cate1No = '3000';
 			}else{
 				cate1No = val.split(',')[0];
@@ -784,6 +785,7 @@
 		}else{
 			cate1No = $("#searchForm select[name=cate2No]").val().split(',')[0];
 		}
+
 		var data = {
 			contentsLoc : contentsLoc
 			,cate1No : cate1No

src/main/webapp/WEB-INF/views/marketing/MorebetterPopupForm.html

@@ -620,8 +620,8 @@
 		return true;
 	};
 
-	var fnCheckData = function (){
-		console.log('[fnCheckData]');
+	// 저장
+	$('#btnMorebetterSave').on('click', function() {
 		// validation
 		if (!gagajf.validation('#moreBetterForm'))
 			return false;
@@ -664,12 +664,6 @@
 			return false;
 		}
 
-	};
-
-	// 저장
-	$('#btnMorebetterSave').on('click', function() {
-		fnCheckData();
-
 		// 각 ag-grid list 수량
 		let allSupplyCompData = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);
 		let allBrandData = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);