Merge branch 'develop' of…

Merge branch 'develop' of http://code.tech.tax.asia.pwcinternal.com/root/legal-entity-mgt into develop

atms-web/src/main/webapp/app/calendar/display/calendar-display.ctrl.js

@@ -904,10 +904,11 @@
                     var calendarList = document.getElementById('calendarList');
                     var html = [];
                     CalendarList.forEach(function (calendar) {
-                        html.push('<div class="lnb-calendars-item"><label>' +
+                        html.push('<div class="lnb-calendars-item" style="background: ' + calendar.borderColor + ' ;"><label>' +
                             '<input type="checkbox" class="tui-full-calendar-checkbox-round" value="' + calendar.id + '" checked>' +
-                            '<span style="border-color: ' + calendar.borderColor + '; background-color: ' + calendar.borderColor + ';margin-top:3px;display:inline-block;vertical-align:top;"></span>' +
-                            '<span style="display:inline-block;line-height:20px;width:100px;">' + calendar.name + '</span>' +
+                            // '<span style="border-color: ' + calendar.borderColor + '; background-color: ' + calendar.borderColor + ';margin-top:3px;display:inline-block;vertical-align:top;"></span>' +
+                            '<span style="margin-top:5px;display:inline-block;vertical-align:top;"></span>' +
+                            '<span style="display:inline-block;line-height:20px;width:80%;color:white;">' + calendar.name + '</span>' +
                             '</label></div>'
                         );
                     });
@@ -928,8 +929,8 @@
                     List.forEach(function (item) {
                         html.push('<div class="lnb-calendars-item"><label>' +
                                 '<input type="checkbox" class="tui-full-calendar-checkbox-round" eleType=' + elementId + ' value="' + item.value + '" checked>' +
-                            '<span class="fa fa-check" style="border-color: ' + color + ';border-size: 1px; margin-top:3px;display:inline-block;vertical-align:top;color:#aaa;line-height:9px;padding-left: 2px;font-size: 11px;"></span>' +
-                                '<span style="display:inline-block;line-height:20px;width:100px;">' + item.name + '</span>' +
+                            '<span class="fa fa-check" style="border-color: ' + color + ';border-size: 1px; margin-top:4px;display:inline-block;vertical-align:top;color:#aaa;line-height:9px;padding-left: 2px;font-size: 11px;"></span>' +
+                                '<span style="display:inline-block;line-height:20px;width:80%;">' + item.name + '</span>' +
                                 '</label></div>'
                             );
                     });

atms-web/src/main/webapp/app/calendar/display/calendar-display.html

@@ -9,9 +9,9 @@
         <div id="lnb-calendars" class="lnb-calendars">
             <div>
                 <div class="lnb-calendars-item">
-                    <label>
+                    <label style="padding: 0 5%;">
                         <input class="tui-full-calendar-checkbox-round" id="viewAll" type="checkbox" value="all" checked>
-                        <span class="fa fa-check" style="border-color: #aaa; border-size: 1px; margin-top: 3px; display: inline-block; vertical-align: top; color: #aaa; line-height: 9px; padding-left: 2px; font-size: 11px; "></span>
+                        <span class="fa fa-check" style="border-color: #6e6e6e; border-size: 1px; margin-top: 1px; display: inline-block; vertical-align: top; color: #6e6e6e; line-height: 9px; padding-left: 2px; font-size: 11px; "></span>
                         <strong>显示所有</strong>
                     </label>
                 </div>
@@ -33,7 +33,7 @@
     </div>
     <div id="right">
         <div id="menu">
-            <span class="dropdown">
+            <span class="dropdown" ng-show="false">
                 <button id="dropdownMenu-calendarType" class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown"
                         aria-haspopup="true" aria-expanded="true">
                     <i id="calendarTypeIcon" class="calendar-icon ic_view_month" style="margin-right: 4px;"></i>
@@ -73,6 +73,8 @@
                 </ul>
             </span>
             <span id="menu-navi">
+                <button type="button" class="btn btn-default btn-sm move-today" data-action="move-today">Agenda</button>
+                <button type="button" class="btn btn-default btn-sm move-today" data-action="move-today">Month</button>
                 <button type="button" class="btn btn-default btn-sm move-today" data-action="move-today">今天</button>
                 <button type="button" class="btn btn-default btn-sm move-day" data-action="move-prev">
                     <i class="calendar-icon ic-arrow-line-left" data-action="move-prev"></i>

atms-web/src/main/webapp/app/calendar/display/calendar-display.less

@@ -106,7 +106,7 @@ input[type=checkbox].tui-full-calendar-checkbox-round+span {
 
 #lnb {
   position: absolute;
-  width: 200px;
+  width: 13%;
   top: 0;
   bottom: 0;
   border-right: 1px solid #d5d5d5;
@@ -116,7 +116,7 @@ input[type=checkbox].tui-full-calendar-checkbox-round+span {
 
 #right {
   position: absolute;
-  left: 200px;
+  left: 13%;
   top: 0;
   right: 0;
   bottom: 0;
@@ -128,7 +128,7 @@ input[type=checkbox].tui-full-calendar-checkbox-round+span {
 }
 
 .lnb-new-schedule {
-  padding-bottom: 12px;
+  padding: 5% 5% 10% 5%;
   border-bottom: 1px solid #e5e5e5;
 }
 
@@ -139,7 +139,7 @@ input[type=checkbox].tui-full-calendar-checkbox-round+span {
   color: #ffffff;
   border: 0;
   border-radius: 4px;
-  padding: 10px 20px;
+  padding: 5% 10%;
   font-weight: bold;
 }
 
@@ -166,7 +166,7 @@ input[type=checkbox].tui-full-calendar-checkbox-round+span {
 }
 
 .lnb-calendars > div {
-  padding: 12px 16px;
+  padding: 12px 5px 12px 0;
   border-bottom: 1px solid #e5e5e5;
   font-weight: normal;
 }
@@ -179,12 +179,18 @@ input[type=checkbox].tui-full-calendar-checkbox-round+span {
 
 .lnb-calendars-d1 label {
   font-weight: normal;
+  display: table;
+  padding: 0 5%;
+  width: 100%;
 }
 
 .lnb-calendars-item {
   min-height: 14px;
   line-height: 14px;
-  padding: 8px 0;
+  padding: 5px 0;
+  margin: 3px 0;
+  border: 0;
+  border-radius: 10px;
 }
 
 .lnb-footer {

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -1667,4 +1667,22 @@ constant.tagTypeList = {
     "interactionInternationSystem" : 2
 };
 
+
+/********key value*****************/
+constant.keyValueType = [
+    { value: 1, name: '系统公共' },
+    { value: 2, name: '自定义' }
+]
+
+// 税务日历事项状态
+constant.EnumTaxEventFinishStatus = {
+    Finished: 1,
+    NotFinished: 0
+}
+
+// 税务日历事项类型
+constant.EnumTaxEventType = {
+    UserDefine: 1,
+    SystemConfig: 2
+}
 /************************************************cit constant end*************************************************/
\ No newline at end of file

atms-web/src/main/webapp/app/framework/app-main/app-main.less

@@ -5,6 +5,7 @@
     width: 100%;
   }
   .default{
+    outline: none;
     position: relative;
     display: inline-block;
     height: 325px;

atms-web/src/main/webapp/app/framework/app-nav/app-nav.html

 <nav class="navbar-custom-top" role="navigation" style="margin-bottom: 0;border-radius:0">
     <div class="nav-container" style="min-width:1435px">
+        <div class="nav-element-left" style="width: 3%;" ng-click="gotoMainPage()"><img src="app-resources/images/entityDB/u40.png"></div>
         <div class="nav-element-left" style="width:250px;text-align:left;font-size:17px;outline:none;" ng-click="gotoMainPage()">
-            <i class="fa fa-bullseye" style="color:red;font-size:22px;margin-right:10px"></i>
             <span style="font-weight:bold;">Entity Info Database</span>
         </div>