~jhpark/owl-kisa.git - maprexDevGit

부모: 6211b73a | 패치 | 커밋 | ignore whitespace

Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2022-01-06 1a4fdeaca6854fffada3d1731ce37ad93d6dabb7

Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

5개 파일 변경됨

	src/main/webapp/i18n/ko/global.json	2 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/app/user/userAdd.controller.js	34 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/views/issue/issueDetail.html	4 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/views/user/superUserAdd.html	12 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/views/user/userAdd.html	12 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리

 src/main/webapp/i18n/ko/global.json

@@ -522,7 +522,9 @@
        "invalidEmailFormat": "이메일 형식이 맞지 않습니다.",
        "enterYourEmailAddress": "입력한 이메일로 알림이 발송됩니다. 꼭 사용하시는 이메일로 입력하세요.",
        "least4CharactersPassword": "비밀번호는 최소 4자 이상 입력해야 합니다.",
        "least8CharactersPassword": "비밀번호는 특수문자 포함 최소 8자 이상 입력해야 합니다.",
        "enter4CharactersPassword": "비밀번호는 4자 이상으로 입력하세요.",
        "enter8CharactersPassword": "비밀번호는 특수문자 포함 8자 이상으로 입력하세요.",
        "differentPassword": "비밀번호가 다릅니다.",
        "contactedEnterPhone": "연락가능한 핸드폰 번호를 입력하세요.",
        "enterTheNameInWorkspace": "사용하고 싶은 업무공간의 이름을 입력하세요.",

 src/main/webapp/scripts/app/user/userAdd.controller.js

@@ -14,7 +14,8 @@
                $scope.fn = {
                    formSubmit : formSubmit,    //  폼 전송
                    formCheck : formCheck,  //  폼 체크
                    onFileSelect : onFileSelect //  프로필 업로드
                    onFileSelect : onFileSelect, //  프로필 업로드
                    autoHypenPhone : autoHypenPhone // 연락처 입력시 - 자동 입력
                };

                $scope.vm = {
@@ -42,6 +43,36 @@
                    else {
                        $scope.vm.form.profileImageName = "";
                    }
                }

                //  연락처 입력시 - 자동 입력
                function autoHypenPhone() {
                    var str = $scope.vm.form.phone
                    str.replace(/^[0-9]/g, '');
                    var tmp = '';
                    if (str.length < 4) {
                        return str;
                    } else if (str.length < 7) {
                        tmp += str.substr(0, 3);
                        tmp += '-';
                        tmp += str.substr(3);
                        $scope.vm.form.phone = tmp;
                    } else if (str.length < 11) {
                        tmp += str.substr(0, 3);
                        tmp += '-';
                        tmp += str.substr(3, 3);
                        tmp += '-';
                        tmp += str.substr(6);
                        $scope.vm.form.phone = tmp;
                    } else {
                        tmp += str.substr(0, 3);
                        tmp += '-';
                        tmp += str.substr(3, 4);
                        tmp += '-';
                        tmp += str.substr(7);
                        $scope.vm.form.phone = tmp;
                    }
                    return str
                }

                function formCheck(formInvalid) {
@@ -76,6 +107,7 @@
                    content.workspaceName = $rootScope.preventXss(content.workspaceName);
                    content.password = CryptoJS.SHA512(content.password).toString();
                    content.language = $rootScope.language; //  기본 언어
                    content.phone = content.phone.replace(/\-/g,'');

                    User.add({
                        method : "POST",

 src/main/webapp/views/issue/issueDetail.html

@@ -105,8 +105,8 @@
                <i class="os-icon os-icon-email-2-at2 mr-20" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.sendCommonMail()" data-toggle="tooltip" data-placement="right" title="직접 작성한 메일 보내기"></i>
                <i class="os-icon os-icon-email-forward mr-20" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.sendMailAll()" data-toggle="tooltip" data-placement="right" title="업체 메일 보내기"></i>
                <i class="os-icon os-icon-airplay mr-20" ng-click="fn.versionView(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="이슈 변경 이력 상세 보기"></i>
                <i class="os-icon os-icon-calendar-time mr-20" ng-if="vm.viewer.modifyPermissionCheck"
                   ng-click="fn.reservation(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="이슈 발생 예약 하기"></i>
<!--                <i class="os-icon os-icon-calendar-time mr-20" ng-if="vm.viewer.modifyPermissionCheck"-->
<!--                   ng-click="fn.reservation(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="이슈 발생 예약 하기"></i>-->
                <i class="os-icon os-icon-edit-1 mr-20" ng-click="fn.modify(vm.viewer.id)"
                   ng-if="vm.viewer.modifyPermissionCheck && vm.viewer.issueStatusVo.issueStatusType != 'CLOSE'" data-toggle="tooltip" data-placement="left" title="이슈 수정 하기"></i>
                <!-- 상위 이슈가 있을때 뒤로가기 버튼 생성 -->

 src/main/webapp/views/user/superUserAdd.html

@@ -59,13 +59,14 @@
                                       kr-input
                                       autocomplete="off"
                                       ng-model="vm.form.password"
                                       minlength="4"
                                       ng-pattern="/^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$/"
                                       minlength="8"
                                       maxLength="20"
                                       required>
                                <div ng-show="userAddForm.password.$error.minlength" class="help-block form-text text-danger"
                                     translate="users.least4CharactersPassword">비밀번호는 최소 4자 이상 입력해야 합니다.
                                <div ng-show="userAddForm.password.$error.pattern" class="help-block form-text text-danger"
                                     translate="users.least8CharactersPassword">비밀번호는 특수문자 포함 최소 8자 이상 입력해야 합니다.
                                </div>
                                <small class="fc-grey" translate="users.enter4CharactersPassword">비밀번호는 4자 이상으로 입력하세요.</small>
                                <small class="fc-grey" translate="users.enter8CharactersPassword">비밀번호는 특수문자 포함 8자 이상으로 입력하세요.</small>
                            </div>
                        </div>
                        <div class="col-sm-6">
@@ -127,11 +128,12 @@
                                <label for="userAddForm6"><span translate="users.phoneNumber">연락처</span> </label>
                                <input id="userAddForm6"
                                       type="text"
                                       maxLength="20"
                                       maxlength="30"
                                       class="form-control"
                                       input-regex="[^0-9]"
                                       kr-input
                                       autocomplete="off"
                                       ng-keyup="fn.autoHypenPhone()"
                                       ng-model="vm.form.phone">
                                <small class="fc-grey"><span translate="users.contactedEnterPhone">연락가능한 핸드폰 번호를 입력하세요.</span>
                                </small>

 src/main/webapp/views/user/userAdd.html

@@ -62,13 +62,14 @@
                                          kr-input
                                          autocomplete="off"
                                          ng-model="vm.form.password"
                                          minlength="4"
                                          ng-pattern="/^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$/"
                                          minlength="8"
                                          maxLength="20"
                                          required>
                                   <div ng-show="userAddForm.password.$error.minlength" class="help-block form-text text-danger"
                                        translate="users.least4CharactersPassword">비밀번호는 최소 4자 이상 입력해야 합니다.
                                   <div ng-show="userAddForm.password.$error.pattern" class="help-block form-text text-danger"
                                        translate="users.least8CharactersPassword">비밀번호는 특수문자 포함 최소 8자 이상 입력해야 합니다.
                                   </div>
                                   <small class="fc-grey" translate="users.enter4CharactersPassword">비밀번호는 4자 이상으로 입력하세요.</small>
                                   <small class="fc-grey" translate="users.enter8CharactersPassword">비밀번호는 특수문자 포함 8자 이상으로 입력하세요.</small>
                               </div>
                           </div>
                           <div class="col-sm-6">
@@ -133,11 +134,12 @@
                                   <label for="userAddForm6"><span translate="users.phoneNumber">연락처</span> </label>
                                   <input id="userAddForm6"
                                          type="text"
                                          maxLength="20"
                                          maxlength="30"
                                          class="form-control"
                                          input-regex="[^0-9]"
                                          kr-input
                                          autocomplete="off"
                                          ng-keyup="fn.autoHypenPhone()"
                                          ng-model="vm.form.phone">
                                   <small class="fc-grey"><span translate="users.contactedEnterPhone">연락가능한 핸드폰 번호를 입력하세요.</span>
                                   </small>

			@@ -522,7 +522,9 @@
			"invalidEmailFormat": "이메일 형식이 맞지 않습니다.",
			"enterYourEmailAddress": "입력한 이메일로 알림이 발송됩니다. 꼭 사용하시는 이메일로 입력하세요.",
			"least4CharactersPassword": "비밀번호는 최소 4자 이상 입력해야 합니다.",
			"least8CharactersPassword": "비밀번호는 특수문자 포함 최소 8자 이상 입력해야 합니다.",
			"enter4CharactersPassword": "비밀번호는 4자 이상으로 입력하세요.",
			"enter8CharactersPassword": "비밀번호는 특수문자 포함 8자 이상으로 입력하세요.",
			"differentPassword": "비밀번호가 다릅니다.",
			"contactedEnterPhone": "연락가능한 핸드폰 번호를 입력하세요.",
			"enterTheNameInWorkspace": "사용하고 싶은 업무공간의 이름을 입력하세요.",

			@@ -14,7 +14,8 @@
			$scope.fn = {
			formSubmit : formSubmit, // 폼 전송
			formCheck : formCheck, // 폼 체크
			onFileSelect : onFileSelect // 프로필 업로드
			onFileSelect : onFileSelect, // 프로필 업로드
			autoHypenPhone : autoHypenPhone // 연락처 입력시 - 자동 입력
			};

			$scope.vm = {
			@@ -42,6 +43,36 @@
			else {
			$scope.vm.form.profileImageName = "";
			}
			}

			// 연락처 입력시 - 자동 입력
			function autoHypenPhone() {
			var str = $scope.vm.form.phone
			str.replace(/^[0-9]/g, '');
			var tmp = '';
			if (str.length < 4) {
			return str;
			} else if (str.length < 7) {
			tmp += str.substr(0, 3);
			tmp += '-';
			tmp += str.substr(3);
			$scope.vm.form.phone = tmp;
			} else if (str.length < 11) {
			tmp += str.substr(0, 3);
			tmp += '-';
			tmp += str.substr(3, 3);
			tmp += '-';
			tmp += str.substr(6);
			$scope.vm.form.phone = tmp;
			} else {
			tmp += str.substr(0, 3);
			tmp += '-';
			tmp += str.substr(3, 4);
			tmp += '-';
			tmp += str.substr(7);
			$scope.vm.form.phone = tmp;
			}
			return str
			}

			function formCheck(formInvalid) {
			@@ -76,6 +107,7 @@
			content.workspaceName = $rootScope.preventXss(content.workspaceName);
			content.password = CryptoJS.SHA512(content.password).toString();
			content.language = $rootScope.language; // 기본 언어
			content.phone = content.phone.replace(/\-/g,'');

			User.add({
			method : "POST",

			@@ -105,8 +105,8 @@
			<i class="os-icon os-icon-email-2-at2 mr-20" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.sendCommonMail()" data-toggle="tooltip" data-placement="right" title="직접 작성한 메일 보내기"></i>
			<i class="os-icon os-icon-email-forward mr-20" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.sendMailAll()" data-toggle="tooltip" data-placement="right" title="업체 메일 보내기"></i>
			<i class="os-icon os-icon-airplay mr-20" ng-click="fn.versionView(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="이슈 변경 이력 상세 보기"></i>
			<i class="os-icon os-icon-calendar-time mr-20" ng-if="vm.viewer.modifyPermissionCheck"
			ng-click="fn.reservation(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="이슈 발생 예약 하기"></i>
			<!-- <i class="os-icon os-icon-calendar-time mr-20" ng-if="vm.viewer.modifyPermissionCheck"-->
			<!-- ng-click="fn.reservation(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="이슈 발생 예약 하기"></i>-->
			<i class="os-icon os-icon-edit-1 mr-20" ng-click="fn.modify(vm.viewer.id)"
			ng-if="vm.viewer.modifyPermissionCheck && vm.viewer.issueStatusVo.issueStatusType != 'CLOSE'" data-toggle="tooltip" data-placement="left" title="이슈 수정 하기"></i>
			<!-- 상위 이슈가 있을때 뒤로가기 버튼 생성 -->

			@@ -59,13 +59,14 @@
			kr-input
			autocomplete="off"
			ng-model="vm.form.password"
			minlength="4"
			ng-pattern="/^(?=.[A-Za-z])(?=.\d)(?=.[@$!%#?&])[A-Za-z\d@$!%*#?&]{8,}$/"
			minlength="8"
			maxLength="20"
			required>
			<div ng-show="userAddForm.password.$error.minlength" class="help-block form-text text-danger"
			translate="users.least4CharactersPassword">비밀번호는 최소 4자 이상 입력해야 합니다.
			<div ng-show="userAddForm.password.$error.pattern" class="help-block form-text text-danger"
			translate="users.least8CharactersPassword">비밀번호는 특수문자 포함 최소 8자 이상 입력해야 합니다.
			</div>
			<small class="fc-grey" translate="users.enter4CharactersPassword">비밀번호는 4자 이상으로 입력하세요.</small>
			<small class="fc-grey" translate="users.enter8CharactersPassword">비밀번호는 특수문자 포함 8자 이상으로 입력하세요.</small>
			</div>
			</div>
			<div class="col-sm-6">
			@@ -127,11 +128,12 @@
			<label for="userAddForm6"><span translate="users.phoneNumber">연락처</span> </label>
			<input id="userAddForm6"
			type="text"
			maxLength="20"
			maxlength="30"
			class="form-control"
			input-regex="[^0-9]"
			kr-input
			autocomplete="off"
			ng-keyup="fn.autoHypenPhone()"
			ng-model="vm.form.phone">
			<small class="fc-grey"><span translate="users.contactedEnterPhone">연락가능한 핸드폰 번호를 입력하세요.</span>
			</small>

			@@ -62,13 +62,14 @@
			kr-input
			autocomplete="off"
			ng-model="vm.form.password"
			minlength="4"
			ng-pattern="/^(?=.[A-Za-z])(?=.\d)(?=.[@$!%#?&])[A-Za-z\d@$!%*#?&]{8,}$/"
			minlength="8"
			maxLength="20"
			required>
			<div ng-show="userAddForm.password.$error.minlength" class="help-block form-text text-danger"
			translate="users.least4CharactersPassword">비밀번호는 최소 4자 이상 입력해야 합니다.
			<div ng-show="userAddForm.password.$error.pattern" class="help-block form-text text-danger"
			translate="users.least8CharactersPassword">비밀번호는 특수문자 포함 최소 8자 이상 입력해야 합니다.
			</div>
			<small class="fc-grey" translate="users.enter4CharactersPassword">비밀번호는 4자 이상으로 입력하세요.</small>
			<small class="fc-grey" translate="users.enter8CharactersPassword">비밀번호는 특수문자 포함 8자 이상으로 입력하세요.</small>
			</div>
			</div>
			<div class="col-sm-6">
			@@ -133,11 +134,12 @@
			<label for="userAddForm6"><span translate="users.phoneNumber">연락처</span> </label>
			<input id="userAddForm6"
			type="text"
			maxLength="20"
			maxlength="30"
			class="form-control"
			input-regex="[^0-9]"
			kr-input
			autocomplete="off"
			ng-keyup="fn.autoHypenPhone()"
			ng-model="vm.form.phone">
			<small class="fc-grey"><span translate="users.contactedEnterPhone">연락가능한 핸드폰 번호를 입력하세요.</span>
			</small>