#510 Not saved indicator improvement (wip)

metasfresh · Mar 8, 2017 · 922745e · 922745e
1 parent 130d833
commit 922745e
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 14 deletions.
diff --git a/src/actions/WindowActions.js b/src/actions/WindowActions.js
@@ -46,13 +46,14 @@ export function initLayoutSuccess(layout, scope) {
     }
 }
 
-export function initDataSuccess(data, scope, docId, saveStatus) {
+export function initDataSuccess(data, scope, docId, saveStatus, validStatus) {
     return {
         type: types.INIT_DATA_SUCCESS,
         data,
         scope,
         docId,
-        saveStatus
+        saveStatus,
+        validStatus
     }
 }
 
@@ -74,11 +75,12 @@ export function updateRowStatus(scope, tabid, rowid, saveStatus) {
     }
 }
 
-export function updateDataSuccess(item, scope, saveStatus) {
+export function updateDataSuccess(item, scope, saveStatus, validStatus) {
     return {
         type: types.UPDATE_DATA_SUCCESS,
         item,
         saveStatus,
+        validStatus,
         scope
     }
 }
@@ -233,7 +235,7 @@ export function createWindow(
 
                 dispatch(initDataSuccess(
                     preparedData, getScope(isModal), docId,
-                    response.data[0].saveStatus
+                    response.data[0].saveStatus, response.data[0].validStatus
                 ));
 
                 if (isModal) {
@@ -385,7 +387,7 @@ function mapDataToState(data, isModal, rowId, id, windowType) {
                             dispatch(updateRowSuccess(field, item.tabid, item.rowId, getScope(false)));
                         }
 
-                        dispatch(updateDataSuccess(field, getScope(isModal), data[0].saveStatus));
+                        dispatch(updateDataSuccess(field, getScope(isModal), data[0].saveStatus, data[0].validStatus));
                     }
                 });
             }

diff --git a/src/assets/css/header.css b/src/assets/css/header.css
@@ -167,6 +167,7 @@
     width: 100%;
     position: fixed;
     z-index: 201;
+    margin-top:-1px;
     background-color: $brand-bright-color;
 }
 
@@ -181,7 +182,7 @@
     overflow: hidden;
 }
 .subheader-column:focus {
-    border-color: #e1e7ec;;
+    border-color: #e1e7ec;
 }
 
 @media (max-width: $breakpoint) {
@@ -268,6 +269,7 @@
 
 .btn-square {
     min-width: 55px;
+
 }
 
 
@@ -296,6 +298,8 @@
 }
 
 .btn-header {
+    position: relative;
+    top:-1px;
     border-color: $brand-border-color;
 }
 

diff --git a/src/assets/css/indicator.css b/src/assets/css/indicator.css
@@ -13,6 +13,8 @@
     height: 100%;
 }
 
+
+
 @media screen and (max-width: 991px) {
     .indicator {
         width: 50%;
@@ -67,6 +69,8 @@
 .indicator-error {
     animation-name: indicator-error;
     animation-duration: 1s;
+    width: 100%;
+    background-color: $brand-font-color-danger;
 }
 
 @keyframes indicator-pending {
@@ -111,7 +115,7 @@
         background-color: $brand-font-color-danger;
     }
     100% {
-        width: 0%;
-        background-color: transparent;
+        width: 100%;
+        background-color: $brand-font-color-danger;
     }
 }
diff --git a/src/assets/css/inputs.css b/src/assets/css/inputs.css
@@ -96,7 +96,7 @@ button {
 
 
 .btn-square {
-    height: 55px;
+    height: 54px;
     width: 55px;
     display: flex;
     flex-direction: column;

diff --git a/src/components/app/Indicator.js b/src/components/app/Indicator.js
@@ -23,8 +23,8 @@ class Indicator extends Component {
         return (
             <div>
                 <div className={
-                        'indicator-bar indicator-' + indicator +
-                        (isDocumentNotSaved ? ' indicator-error ' : ' ')
+                    'indicator-bar ' +
+                    (isDocumentNotSaved ? 'indicator-error ' : 'indicator-' + indicator)
                 } />
             </div>
         )

diff --git a/src/containers/MasterWindow.js b/src/containers/MasterWindow.js
@@ -121,7 +121,10 @@ class MasterWindow extends Component {
                 attachments={attachments}
                 showSidelist={true}
                 showIndicator={!modal.visible}
-                isDocumentNotSaved={!master.saveStatus.saved}
+                isDocumentNotSaved={
+                    !master.saveStatus.saved && 
+                    !master.validStatus.initialValue
+                }
             >
                 {modal.visible &&
                     <Modal

diff --git a/src/reducers/windowHandler.js b/src/reducers/windowHandler.js
@@ -28,7 +28,8 @@ const initialState = {
         layout: {},
         data: [],
         rowData: {},
-        saveStatus: {}
+        saveStatus: {},
+        validStatus: {}
     },
     indicator: 'saved',
     latestNewDocument: null,
@@ -99,7 +100,8 @@ export default function windowHandler(state = initialState, action) {
                     docId: action.docId,
                     layout: {},
                     rowData: {},
-                    saveStatus: action.saveStatus
+                    saveStatus: action.saveStatus,
+                    validStatus: action.validStatus
                 })
         })