Merge branch 'dev' into preprod

add environment variables and point api based on them
add preprod stie
2023-12-25 13:51:16 +05:30 · 2023-12-25 13:46:54 +05:30 · 2023-12-18 09:16:57 +05:30 · 2023-12-14 16:45:53 +05:30 · 2023-12-14 15:31:43 +05:30 · 2023-12-12 22:12:26 +05:30
13 changed files with 79 additions and 35 deletions
--- a/.firebaserc
+++ b/.firebaserc
@@ -10,6 +10,9 @@
        ],
        "qa": [
          "hpos-qa"
+        ],
+        "dev": [
+          "hpos-dev"
        ]
      }
    }
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@

 # misc
 .DS_Store
+.env
 .env.local
 .env.development.local
 .env.test.local
@@ -30,4 +31,5 @@ public/india-states.json
 *.apk

 scripts/reports
-scripts/data
+scripts/data
+firebase-debug.log
--- a/README.md
+++ b/README.md
@@ -30,6 +30,6 @@

 ### deploy

-    firebase deploy --only hosting:dev1
+    firebase deploy --only hosting:dev

 pyinstaller --noconfirm --noconsole -i "smi.ico" --windowed --clean hemocube.py
--- a/firebase.json
+++ b/firebase.json
@@ -1,6 +1,6 @@
 {
  "hosting": {
-    "target": "qa",
+    "target": "preprod",
    "public": "build",
    "ignore": [
      "firebase.json",
--- a/src/components/Accuracy.js
+++ b/src/components/Accuracy.js
@@ -34,7 +34,7 @@ function Accuracy({ show }) {
                    'YYYY-MM-DD'
                )}&end_date=${moment(endDate).format('YYYY-MM-DD')}`;

-                const url = `https://asia-south1-hpos-qa.cloudfunctions.net/performance?${queryString}`;
+                const url = `https://asia-south1-hpos-af3cc.cloudfunctions.net/performance?${queryString}`;

                // Make a POST request using the Fetch API
                const response = await fetch(url, {
--- a/src/components/ExportData.js
+++ b/src/components/ExportData.js
@@ -11,7 +11,7 @@ function ExportData({ url, show }) {
    const [endDate, setEndDate] = useState("");

    const fetchFile = (start_date, end_date) => {
-        window.location.href = `https://asia-south1-hpos-qa.cloudfunctions.net/consolidation?start_date=${moment(startDate).format("YYYY-MM-DD")}&end_date=${moment(endDate).format("YYYY-MM-DD")}`;
+        window.location.href = `https://asia-south1-${process.env.REACT_APP_FIREBASE_PROJECT_ID}.cloudfunctions.net/consolidation?start_date=${moment(startDate).format("YYYY-MM-DD")}&end_date=${moment(endDate).format("YYYY-MM-DD")}`;
    }

    return (
--- a/src/components/Registration.js
+++ b/src/components/Registration.js
@@ -16,7 +16,7 @@ function Registration() {
        setCounter(counter + 1);
        axios({
            method: 'post',
-            url: "https://asia-south1-hpos-qa.cloudfunctions.net/registerUser",
+            url: `https://asia-south1-${process.env.REACT_APP_FIREBASE_PROJECT_ID}.cloudfunctions.net/registerUser`,
            data: {
                "_id": id,
                "aadharId": "2808202300001",
@@ -65,7 +65,7 @@ function Registration() {
        setMessage("");
        axios({
            method: 'get',
-            url: "https://asia-south1-hpos-qa.cloudfunctions.net/clearUsers",
+            url: `https://asia-south1-${process.env.REACT_APP_FIREBASE_PROJECT_ID}.cloudfunctions.net/clearUsers`,
            withCredentials: false,
            secure: false,
            headers: {
--- a/src/components/Samples.css
+++ b/src/components/Samples.css
@@ -2,6 +2,7 @@
    font-family: Arial, Helvetica, sans-serif;
    border-collapse: collapse;
    width: 100%;
+    font-size: small;
 }

 #samples-table td,
--- a/src/components/Samples.js
+++ b/src/components/Samples.js
@@ -15,9 +15,10 @@ const Samples = () => {
            const unsub = onSnapshot(q, (querySnapshot) => {
                const samples = [];
                querySnapshot.forEach((document) => {
-                    console.log(document.data());
-                    const alert = document.data();
-                    samples.push(alert);
+                    console.log(document.id);
+                    const data = document.data();
+                    const id = document.id;
+                    samples.push({id, ...data});
                });
                setSamples(samples);
            });
@@ -48,24 +49,35 @@ const Samples = () => {
                <table id="samples-table">
                    <tr>
                        <th>Sample Name</th>
-                        <th>Device</th>
-                        <th>Classification</th>
-                        <th>abs1</th>
-                        <th>abs2</th>
-                        <th>abs3</th>
+                        <th>Pdr Class</th>
+                        <th>Dev Ratio Class</th>
+                        <th>SR Class</th>
                        <th>PDR</th>
+                        <th>Dev Ratio</th>
+                        <th>Slope Ratio</th>
+                        <th>led1Sample</th>
+                        {/* <th>led2Average</th> */}
+                        <th>led2Sample</th>
+                        <th>led3Sample</th>
+                        <th>led4Sample</th>
+                        <th>Device</th>
                        <th>Time</th>
                    </tr>
                    {samples.map((sample, index) => (
                        <tr key={index} className='samples-table-tr'>
-                            <td>{sample.name}</td>
+                            <td>{sample.name || sample._id}</td>
+                            <td>{sample.prdClassification}</td>
+                            <td>{sample.deviceRatioClass}</td>
+                            <td>{sample.slopeRatioClass}</td>
+                            <td>{sample?.predictedDenovixRatio?.toFixed(4)}</td>
+                            <td>{sample?.deviceRatio?.toFixed(4)}</td>
+                            <td>{sample?.slopeRatio?.toFixed(4)}</td>
+                            <td>{sample.led1Sample || 'NA'}</td>
+                            <td>{sample.led2Sample || 'NA'}</td>
+                            <td>{sample.led3Sample || 'NA'}</td>
+                            <td>{sample.led4Sample || 'NA'}</td>
                            <td>{sample.deviceId}</td>
-                            <td>{sample.prdClassification || 'NA'}</td>
-                            <td>{sample.abs1}</td>
-                            <td>{sample.abs2 || 'NA'}</td>
-                            <td>{sample.abs3 || 'NA'}</td>
-                            <td>{sample.predictedDenovixRatio}</td>
-                            <td>{sample.testTime}</td>
+                            <td>{moment(sample.testTime).format('HH:MM:SS')}</td>
                        </tr>
                    ))}
                </table>
--- a/src/components/TestAnalytics.js
+++ b/src/components/TestAnalytics.js
@@ -53,7 +53,10 @@ const TestAnalytics = () => {
                const dailyCountsList = Object.entries(dailyCounts).sort().map(x => {
                    return { date: x[0], count: x[1] };
                });
-                setDailyResults(dailyCountsList);
+                if (dailyCountsList?.length > 7)
+                    setDailyResults(dailyCountsList.slice(dailyCountsList.length - 7, dailyCountsList.length));
+                else
+                    setDailyResults(dailyCountsList);
                const rss = _.groupBy(hposTests, function (test) {
                    return moment(test.testTime).startOf('day').format();
                });
--- a/src/components/TestAnalyticsGraph.js
+++ b/src/components/TestAnalyticsGraph.js
@@ -26,7 +26,7 @@ class TestAnalyticsGraph extends Component {
        data.reverse();

        var margin = { top: 30, right: 20, bottom: 50, left: 15 },
-            width = 1500 - margin.left - margin.right,
+            width = 400 - margin.left - margin.right,
            height = 180 - margin.top - margin.bottom;

        var svg = d3.select("#tests-count-graph").append('svg')
@@ -113,7 +113,7 @@ class TestAnalyticsGraph extends Component {
    drawChart(data) {
        if (!data) return;
        var margin = { top: 20, right: 20, bottom: 30, left: 50 },
-            width = 960 - margin.left - margin.right,
+            width = 420 - margin.left - margin.right,
            height = 500 - margin.top - margin.bottom;

        const INNER_WIDTH = width;// - margin.left - margin.right;
--- a/src/components/nav/Topbar.js
+++ b/src/components/nav/Topbar.js
@@ -16,7 +16,7 @@ const Topbar = () => {
    >
      <Toolbar>
        <Typography variant="h6">
-          HPOS Web - Quality / QA
+          HPOS Web - {process.env.REACT_APP_TOPBAR_TITLE}
        </Typography>
      </Toolbar>
    </AppBar>
--- a/src/firebase.js
+++ b/src/firebase.js
@@ -14,16 +14,39 @@ import { getAnalytics } from "firebase/analytics";
 //     measurementId: "G-6JHQ47S9DD"
 //   };
  
-/* qa: hpos-qa */
+// /* qa: hpos-qa */
+// const firebaseConfig = {
+//   apiKey: "AIzaSyCF7BNZ5vOMQIpKRi_vxquzWP5pIjcb59I",
+//   authDomain: "hpos-qa.firebaseapp.com",
+//   projectId: "hpos-qa",
+//   storageBucket: "hpos-qa.appspot.com",
+//   messagingSenderId: "1004619739289",
+//   appId: "1:1004619739289:web:c3ee0c0127f0d073e5c808",
+//   measurementId: "G-4MSTJHE64W"
+// };
+
+
+/* preprod */
 const firebaseConfig = {
-  apiKey: "AIzaSyCF7BNZ5vOMQIpKRi_vxquzWP5pIjcb59I",
-  authDomain: "hpos-qa.firebaseapp.com",
-  projectId: "hpos-qa",
-  storageBucket: "hpos-qa.appspot.com",
-  messagingSenderId: "1004619739289",
-  appId: "1:1004619739289:web:c3ee0c0127f0d073e5c808",
-  measurementId: "G-4MSTJHE64W"
-};
+    apiKey: "AIzaSyBFl_YkJ5PMIvMY3G70313SyrqemjFnUv8",
+    authDomain: "hpos-af3cc.firebaseapp.com",
+    projectId: "hpos-af3cc",
+    storageBucket: "hpos-af3cc.appspot.com",
+    messagingSenderId: "650071678820",
+    appId: "1:650071678820:web:ce50538bf46632d46c6471",
+    measurementId: "G-6JHQ47S9DD"
+  };
+  
+// /* qa: hpos-qa */
+// const firebaseConfig = {
+//   apiKey: "AIzaSyCF7BNZ5vOMQIpKRi_vxquzWP5pIjcb59I",
+//   authDomain: "hpos-qa.firebaseapp.com",
+//   projectId: "hpos-qa",
+//   storageBucket: "hpos-qa.appspot.com",
+//   messagingSenderId: "1004619739289",
+//   appId: "1:1004619739289:web:c3ee0c0127f0d073e5c808",
+//   measurementId: "G-4MSTJHE64W"
+// };


 // /* preprod */
Author	SHA1	Message	Date
Pritimay Sarkar	d327fecf8c	Merge branch 'dev' into preprod	2023-12-25 13:51:16 +05:30
Pritimay Sarkar	43375556bf	add environment variables and point api based on them	2023-12-25 13:46:54 +05:30
Pritimay Sarkar	92feb4081c	add preprod stie	2023-12-18 09:16:57 +05:30
Pritimay Sarkar	bb968b4781	ad dtarget	2023-12-14 16:45:53 +05:30
Pritimay Sarkar	a751b55647	add new class column	2023-12-14 15:31:43 +05:30
Pritimay Sarkar	099b3f08fa	add dev web app	2023-12-12 22:12:26 +05:30
Pritimay Sarkar	c20197c40a	add log in ignore	2023-11-17 10:55:22 +05:30
Pritimay Sarkar	ca5106d613	resize card for test counts	2023-11-16 16:33:38 +05:30
Pritimay Sarkar	9c782b7cd1	add css	2023-11-16 16:21:32 +05:30
Pritimay Sarkar	707e338d3a	new columns	2023-11-16 14:28:37 +05:30
Pritimay Sarkar	367c36e3f8	revert to old method of cls	2023-11-11 15:35:03 +05:30
Pritimay Sarkar	fc31aea95b	new prd classification	2023-11-11 10:53:38 +05:30
Pritimay Sarkar	920858a523	add config	2023-11-09 08:49:00 +05:30
Pritimay Sarkar	16aa545862	add qa firebase config	2023-11-09 08:01:53 +05:30
Pritimay Sarkar	65723718c6	add app installation notes	2023-11-09 07:48:36 +05:30
Pritimay Sarkar	fb3d715831	add env name on page title	2023-11-09 07:48:20 +05:30
Pritimay Sarkar	683c6049af	add clear button	2023-11-09 07:47:47 +05:30
Pritimay Sarkar	34a770ceed	add samples page	2023-11-09 07:46:45 +05:30
Pritimay Sarkar	67a7414d5c	hide clear users button in preprod	2023-11-07 10:53:39 +05:30