Merge pull request #166 from kjannette/hite2

more

src/Components/Document/DocEditPage.js

@@ -548,7 +548,7 @@ const DocEditPage = (props) => {
           <div className="doc-editing-sub-wrapper">
             {parsedRogs?.map((rog, i) => (
               <div className="req-item-outer-div">
-                <div className="request-text-up">
+                <div className="doced-request-text-up">
                   {numberingContent(i)}
                   {rog?.text}
                 </div>

src/Components/Document/ReqEditPage.js

@@ -155,15 +155,18 @@ const RequestEditPage = () => {
   }
 
   async function createAndReturnDocx() {
-    window.scrollTo({ top: 0 });
-    //setIsBusy(true);
+    setIsBusy(true);
     const response = await handleCreateDocx();
-    if (response && response?.status === 200) {
+
+    if (response?.status != 500) {
       setTimeout(getDocx, 5000);
       setTimeout(cleanUpDocx, 10000);
     } else {
       setShowErrorModal(true);
     }
+    window.scrollTo(0, 0);
+    setTimeout(setIsBusy, 4000, false);
+    //setIsBusy(false);
   }
 
   const postEditedrequests = () => {};

src/styles/docedit-page.scss

@@ -335,6 +335,17 @@
   }
 }
 
+.doced-request-text-up {
+  color: #a2a2a2;
+  margin-top: 5px;
+  margin-left: 8px;
+  margin-bottom: 16px;
+  text-align: justify;
+  &.reqq {
+    max-width: 24px;
+  }
+}
+
 .request-text-up-row {
   display: flex;
   flex-direction: row;