@dhiraj0720/report1chart 2.6.4 → 2.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhiraj0720/report1chart",
-  "version": "2.6.4",
+  "version": "2.6.6",
   "main": "src/index.jsx",
   "scripts": {
     "test": "echo 'No tests'"

package/src/screens/Report2AScreen.jsx

@@ -1,13 +1,16 @@
-// src/screens/Report2AScreen.jsx
 import React, { useEffect, useState } from 'react';
 import {
   ScrollView,
   Text,
   TouchableOpacity,
   View,
-  ActivityIndicator,
   StyleSheet,
+  Modal,
+  Dimensions,
+  ActivityIndicator,
 } from 'react-native';
+import { PinchGestureHandler, State } from 'react-native-gesture-handler';
+import Svg from 'react-native-svg'; // if not imported globally
 import { filterChartByMonths } from '../utils/filterChartByMonths';
 import { getDivisions, getTable, getLine, getBar } from '../api/report2Fetcher';
 import MonthFilterModal from '../components/MonthFilterModal';
@@ -15,6 +18,20 @@ import DivisionFilterModal from '../components/DivisionFilterModal';
 import FrozenTableReport2A from '../components/FrozenTableReport2A';
 import SvgLineChartCompact from '../components/SvgLineChartCompact';
 import SvgBarLineChartCompact from '../components/SvgBarLineChartCompact';
+import { FilterIcon, FullScreenIcon } from './icons'; // or inline
+
+// Proper SVG Funnel Icon Component (clean black filter icon)
+const FunnelIcon = () => (
+  <View style={styles.funnelIcon}>
+    <View style={styles.funnelTop} />
+    <View style={styles.funnelBody} />
+    <View style={styles.funnelLines}>
+      <View style={styles.line1} />
+      <View style={styles.line2} />
+      <View style={styles.line3} />
+    </View>
+  </View>
+);
 
 const Report2AScreen = ({ api, token, onBack }) => {
   const [monthsModal, setMonthsModal] = useState(false);
@@ -24,6 +41,8 @@ const Report2AScreen = ({ api, token, onBack }) => {
   const [selectedMonths, setSelectedMonths] = useState([]);
   const [divisions, setDivisions] = useState([]);
   const [division, setDivision] = useState(null);
+  const [fullscreen, setFullscreen] = useState(false);
+  const [zoomScale, setZoomScale] = useState(1);
 
   const [table, setTable] = useState(null);
   const [line, setLine] = useState(null);
@@ -31,25 +50,19 @@ const Report2AScreen = ({ api, token, onBack }) => {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null);
 
-  // Fetch divisions
+  
   useEffect(() => {
     if (!api?.divisions || !token) return;
 
     getDivisions(api.divisions, token)
       .then((d) => {
         setDivisions(d);
-        if (d.length > 0) {
-          setDivision(d[0].code);
-        }
+        if (d.length > 0) setDivision(d[0].code);
       })
-      .catch((err) => {
-        console.error('Failed to load divisions:', err);
-        setError('Failed to load divisions');
-        setLoading(false);
-      });
+      .catch(() => setError('Failed to load divisions'))
+      .finally(() => setLoading(false));
   }, [api?.divisions, token]);
 
-  // Fetch data when division changes
   useEffect(() => {
     if (!division || !api || !token) return;
 
@@ -57,106 +70,126 @@ const Report2AScreen = ({ api, token, onBack }) => {
     setError(null);
 
     Promise.all([
-      getTable(api.table, division, token).catch(() => null),
-      getLine(api.line, division, token).catch(() => null),
-      getBar(api.bar, division, token).catch(() => null),
+      getTable(api.table, division, token),
+      getLine(api.line, division, token),
+      getBar(api.bar, division, token),
     ])
       .then(([t, l, b]) => {
-        if (!t || !l || !b) {
-          setError('Failed to load report data');
-          return;
-        }
-
         setTable(t);
         setLine(l);
         setBar(b);
         setMonths(l.labels || []);
         setSelectedMonths(l.labels || []);
       })
-      .catch((err) => {
-        console.error('Data fetch error:', err);
-        setError('Network error or data unavailable');
-      })
-      .finally(() => {
-        setLoading(false);
-      });
+      .catch(() => setError('Failed to load data'))
+      .finally(() => setLoading(false));
   }, [division, api, token]);
 
-  // Loading State
   if (loading) {
     return (
       <View style={styles.center}>
-        <ActivityIndicator size="large" color="#1e88e5" />
-        <Text style={styles.loadingText}>Loading Report 2A...</Text>
+        <ActivityIndicator size="large" color="#000" />
+        <Text style={styles.loadingText}>Loading...</Text>
       </View>
     );
   }
 
-  // Error State
   if (error) {
     return (
       <View style={styles.center}>
         <Text style={styles.errorText}>{error}</Text>
         <TouchableOpacity onPress={onBack}>
-          <Text style={styles.backLink}>← Go Back</Text>
+          <Text style={styles.backLink}>‹ Back to Reports</Text>
         </TouchableOpacity>
       </View>
     );
   }
 
-  // Safety check
   if (!table || !line || !bar || !division) {
-    return (
-      <View style={styles.center}>
-        <Text>No data available</Text>
-      </View>
-    );
+    return <View style={styles.center}><Text>No data available</Text></View>;
   }
 
-  const filteredRows = table.rows.filter((r) =>
-    selectedMonths.includes(r.monthLabel)
-  );
-
+const currentDivisionName = divisions.find(d => d.code === division)?.displayName || 'Division';
+  const filteredRows = table.rows.filter(r => selectedMonths.includes(r.monthLabel));
   const filteredLine = filterChartByMonths(line, selectedMonths);
   const filteredBar = filterChartByMonths(bar, selectedMonths);
 
   return (
-    <ScrollView style={styles.container}>
-      {/* Header */}
-      <Text onPress={onBack} style={styles.backButton}>
-        ‹ Back
-      </Text>
-
-      {/* Filters */}
-      <View style={styles.filterRow}>
-        <TouchableOpacity onPress={() => setMonthsModal(true)}>
-          <Text style={styles.filterText}>Months ⛃</Text>
+    <View style={styles.container}>
+      {/* HEADER WITH BACK ICON + HEADING */}
+      <View style={styles.header}>
+        <TouchableOpacity onPress={onBack} style={styles.backButton}>
+          <Text style={styles.backIcon}>‹</Text>
         </TouchableOpacity>
 
+        <Text style={styles.headerTitle}>
+          {currentDivisionName} Transportation
+        </Text>
+      </View>
+
+      {/* FILTERS - BLACK TEXT + PROPER FUNNEL ICON */}
+      <View style={styles.filterBar}>
+        <TouchableOpacity onPress={() => setMonthsModal(true)} style={styles.filterItem}>
+          <FilterIcon />
+          <Text style={styles.filterText}>Months ({selectedMonths.length}/{months.length})</Text>
+        </TouchableOpacity>
+
+        <TouchableOpacity onPress={() => setDivisionModal(true)} style={styles.filterItem}>
+          <FilterIcon />
+          <Text style={styles.filterText}>{currentDivisionName}</Text>
+        </TouchableOpacity>
+      </View>
+
+      <ScrollView style={styles.content}>
+        {/* FULL SCREEN ICON ABOVE TABLE */}
         <TouchableOpacity
-          onPress={() => setDivisionModal(true)}
-          style={{ marginLeft: 20 }}
+          onPress={() => setFullscreen(true)}
+          style={styles.fullScreenBtn}
         >
-          <Text style={styles.filterText}>
-            Division: {divisions.find((d) => d.code === division)?.displayName || division}
-          </Text>
+          <FullScreenIcon size={28} />
+          <Text style={styles.fullScreenText}>Full Screen View</Text>
         </TouchableOpacity>
-      </View>
 
-      {/* Table */}
-      <FrozenTableReport2A rows={filteredRows} />
+        <FrozenTableReport2A rows={filteredRows} />
 
-      {/* Line Chart */}
-      <View style={styles.chartContainer}>
-        <SvgLineChartCompact data={filteredLine} />
-      </View>
+        <View style={styles.chartContainer}>
+          <SvgLineChartCompact data={filteredLine} />
+        </View>
 
-      {/* Bar + Budget Chart */}
-      <View style={styles.chartContainer}>
-        <SvgBarLineChartCompact data={filteredBar} />
-      </View>
+        <View style={styles.chartContainer}>
+          <SvgBarLineChartCompact data={filteredBar} />
+        </View>
+      </ScrollView>
+
+      {/* MODALS */}
+
+      {/* FULL SCREEN MODAL */}
+      <Modal visible={fullscreen} supportedOrientations={['portrait', 'landscape']}>
+        <View style={styles.fullModal}>
+          <View style={styles.fullHeader}>
+            <TouchableOpacity onPress={() => setFullscreen(false)}>
+              <Text style={styles.closeFull}>✕</Text>
+            </TouchableOpacity>
+            <Text style={styles.fullTitle}>Rotate device to landscape for best view</Text>
+          </View>
+
+          <PinchGestureHandler
+            onGestureEvent={(e) => setZoomScale(e.nativeEvent.scale)}
+            onHandlerStateChange={(e) => {
+              if (e.nativeEvent.state === State.END) {
+                setZoomScale(Math.max(0.8, Math.min(e.nativeEvent.scale, 3)));
+              }
+            }}
+          >
+            <View style={styles.zoomView}>
+              <View style={{ transform: [{ scale: zoomScale }] }}>
+                <FrozenTableReport2A rows={table.rows} isFullscreen /> {/* all rows */}
+              </View>
+            </View>
+          </PinchGestureHandler>
+        </View>
+      </Modal>
 
-      {/* Modals */}
       <MonthFilterModal
         visible={monthsModal}
         months={months}
@@ -172,50 +205,91 @@ const Report2AScreen = ({ api, token, onBack }) => {
         onSelect={setDivision}
         onClose={() => setDivisionModal(false)}
       />
-    </ScrollView>
+    </View>
   );
 };
 
 const styles = StyleSheet.create({
-  container: { padding: 12, backgroundColor: '#f8f9fa' },
-  center: {
-    flex: 1,
-    justifyContent: 'center',
+  container: { flex: 1, backgroundColor: '#f8f9fa' },
+  center: { flex: 1, justifyContent: 'center', alignItems: 'center', padding: 20 },
+  loadingText: { marginTop: 12, fontSize: 16, color: '#000' },
+  errorText: { fontSize: 16, color: '#d32f2f', textAlign: 'center', marginBottom: 20 },
+  backLink: { fontSize: 18, color: '#000', fontWeight: '600' },
+
+  header: {
+    flexDirection: 'row',
     alignItems: 'center',
-    padding: 20,
-  },
-  loadingText: {
-    marginTop: 12,
-    fontSize: 16,
-    color: '#555',
+    paddingHorizontal: 16,
+    paddingVertical: 18,
+    backgroundColor: '#fff',
+    borderBottomWidth: 1,
+    borderColor: '#eee',
   },
-  errorText: {
-    fontSize: 16,
-    color: '#d32f2f',
+  backButton: { paddingRight: 12 },
+  backIcon: { fontSize: 28, color: '#000', fontWeight: '300' },
+  headerTitle: {
+    fontSize: 19,
+    fontWeight: '700',
+    color: '#000',
+    flex: 1,
     textAlign: 'center',
-    marginBottom: 20,
   },
-  backLink: {
-    fontSize: 18,
-    color: '#1e88e5',
-    fontWeight: '600',
-  },
-  backButton: {
-    fontSize: 20,
-    color: '#1e88e5',
-    marginBottom: 16,
-    fontWeight: '600',
+
+  filterBar: {
+    flexDirection: 'row',
+    justifyContent: 'space-around',
+    paddingVertical: 14,
+    backgroundColor: '#fff',
+    borderBottomWidth: 1,
+    borderColor: '#eee',
   },
-  filterRow: {
+  filterItem: {
     flexDirection: 'row',
     alignItems: 'center',
-    marginVertical: 12,
+    paddingHorizontal: 16,
+    paddingVertical: 8,
   },
   filterText: {
     fontSize: 16,
-    color: '#1e88e5',
+    color: '#000',
     fontWeight: '600',
+    marginLeft: 8,
   },
+
+  // Proper Funnel Icon (SVG-style with Views)
+  funnelIcon: {
+    width: 20,
+    height: 20,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  funnelTop: {
+    width: 16,
+    height: 4,
+    backgroundColor: '#000',
+    borderRadius: 2,
+  },
+  funnelBody: {
+    width: 10,
+    height: 10,
+    borderLeftWidth: 4,
+    borderRightWidth: 4,
+    borderBottomWidth: 8,
+    borderColor: 'transparent',
+    borderBottomColor: '#000',
+    marginTop: -2,
+  },
+  funnelLines: {
+    position: 'absolute',
+    top: 6,
+    left: 4,
+    right: 4,
+  },
+  line1: { height: 1, backgroundColor: '#000', marginVertical: 2 },
+  line2: { height: 1, backgroundColor: '#000', marginVertical: 2 },
+  line3: { height: 1, backgroundColor: '#000', marginVertical: 2 },
+
+  content: { flex: 1, padding: 12 },
   chartContainer: {
     borderWidth: 1,
     borderColor: '#ddd',
@@ -224,6 +298,20 @@ const styles = StyleSheet.create({
     marginVertical: 12,
     backgroundColor: '#fff',
   },
+  fullScreenBtn: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center',
+    padding: 12,
+    marginBottom: 12,
+  },
+  fullScreenText: { marginLeft: 8, fontSize: 16, color: '#000', fontWeight: '600' },
+
+  fullModal: { flex: 1, backgroundColor: '#fff' },
+  fullHeader: { flexDirection: 'row', alignItems: 'center', justifyContent: 'center', padding: 16, backgroundColor: '#f8f9fa', position: 'relative' },
+  closeFull: { position: 'absolute', left: 16, fontSize: 28, color: '#000' },
+  fullTitle: { fontSize: 16, color: '#000' },
+  zoomView: { flex: 1, justifyContent: 'center', alignItems: 'center' },
 });
 
 export default Report2AScreen;

package/src/screens/icons.js

@@ -0,0 +1,34 @@
+import Svg, { Path } from 'react-native-svg';
+
+// Filter Funnel Icon (exact match to your image)
+const FilterIcon = ({ size = 20, color = '#000' }) => (
+  <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
+    <Path
+      d="M20 4H4V6.5L12 14.5L20 6.5V4Z"
+      stroke={color}
+      strokeWidth={2}
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    />
+    <Path
+      d="M8 11V19L16 19V11"
+      stroke={color}
+      strokeWidth={2}
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    />
+  </Svg>
+);
+
+// Full Screen Expand Icon
+const FullScreenIcon = ({ size = 24, color = '#000' }) => (
+  <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
+    <Path
+      d="M8 3H5C4.44772 3 4 3.44772 4 4V8M20 8V4C20 3.44772 19.5523 3 19 3H16M16 21H19C19.5523 21 20 20.5523 20 20V16M4 16V20C4 20.5523 4.44772 21 5 21H8"
+      stroke={color}
+      strokeWidth={2}
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    />
+  </Svg>
+);