gitea_admin/krishnasales_mobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: gitea_admin:1d4ec78360ea3afda7466adfc83feafd37d37393
Branches Tags
gitea_admin:main
..
compare: gitea_admin:eff824a4adbd635e8abc3bc2fe8b24ebb2a16b87
Branches Tags
gitea_admin:main

No commits in common. "1d4ec78360ea3afda7466adfc83feafd37d37393" and "eff824a4adbd635e8abc3bc2fe8b24ebb2a16b87" have entirely different histories.
1d4ec78360 ... eff824a4ad

7 changed files with 46 additions and 62 deletions
Show Stats Expand all files Collapse all files

16
fix_lower.cjs Normal file
View File

@ -0,0 +1,16 @@
const fs = require('fs');
const files = [
'f:/WorkPlace/dev/krishnasales_mobile/src/components/forms/fields/SmartGridField.tsx',
'f:/WorkPlace/dev/krishnasales_mobile/src/components/forms/DynamicForm.tsx'
];
files.forEach(file => {
let content = fs.readFileSync(file, 'utf8');
content = content.replace(/col\.name\.toLowerCase/g, "(col.name || '').toLowerCase");
content = content.replace(/col\.id\.toLowerCase/g, "(col.id || '').toLowerCase");
content = content.replace(/c\.name\.toLowerCase/g, "(c.name || '').toLowerCase");
content = content.replace(/f\.id\.toLowerCase/g, "(f.id || '').toLowerCase");
content = content.replace(/f\.name\.toLowerCase/g, "(f.name || '').toLowerCase");
content = content.replace(/col\.mapped_workflow_field\?\.toLowerCase/g, "(col.mapped_workflow_field || '').toLowerCase");
fs.writeFileSync(file, content, 'utf8');
console.log('Fixed', file);
});

6
src/api/config.ts
View File

@ -253,7 +253,7 @@ export const SALES_REPORT_SO_NAMES = [
// --- Pipeline Endpoints ---
export const PIPELINE = {
endpoints: {
nearestStores: '/api/p/krishna-group/v1/nearest-stores',
nearestStores: '/api/papi2/nearest-stores',
dailySalesReport: '/api/papi2/daily-sales-report',
productiveCallSummary: '/api/papi2/productive-call-summary',
salesOfficers: '/api/papi2/sales-officers'
@ -263,7 +263,3 @@ export const PIPELINE = {
export const HIDDEN_FORM_FIELDS = [
'store_code_3',
];
export const SELECT_OPTION_LIMIT = 500;
export const PDF_MAX_SKUS_PER_CHUNK = 20;

4
src/components/forms/DynamicForm.tsx
View File

@ -17,7 +17,7 @@ import {
WfLookupField,
RadioField,
} from './fields';
import { ORDER_BOOKING, STORE, DAILY_REPORTS, HIDDEN_FORM_FIELDS, SELECT_OPTION_LIMIT } from '../../api/config';
import { ORDER_BOOKING, STORE, DAILY_REPORTS, HIDDEN_FORM_FIELDS } from '../../api/config';
export interface DynamicFormProps {
client: ZinoClient;
@ -457,7 +457,7 @@ export function DynamicForm({ client, activityId: initialActivityId, instanceId:
activityId: ORDER_BOOKING.activities.LOG_VISIT.uid,
fieldId: ORDER_BOOKING.activities.LOG_VISIT.fields.selectStore,
formData: { ...(chainedPrefillData as any || {}), ...values, ...(schema?.prefill_data as any || {}) },
limit: SELECT_OPTION_LIMIT
limit: 500
});
const arr = Array.isArray(lookupRes) ? lookupRes : (lookupRes.data || lookupRes.records || []);
const row = arr.find((r: any) => String(r.instance_id || r.id) === String(storeId));

6
src/components/forms/LogVisitForm.tsx
View File

@ -1,7 +1,7 @@
import { useState, useEffect, useCallback, useRef } from 'react';
import type { ZinoClient } from '../../api/client';
import type { FormScreenResponse } from '../../api/types';
import { ORDER_BOOKING, HIDDEN_FORM_FIELDS, SELECT_OPTION_LIMIT } from '../../api/config';
import { ORDER_BOOKING, HIDDEN_FORM_FIELDS } from '../../api/config';
import { Button } from '../buttons/Button';
import { Select } from '../reusable/Select';
import { DateField, TimeField, FileInput, TextField } from './fields';
@ -148,7 +148,7 @@ export function LogVisitForm({ client, onSuccess, onCancel, onActivityChange }:
activityId,
fieldId: 'select_store',
formData: formDataToSend,
limit: SELECT_OPTION_LIMIT,
limit: 200,
});
const arr = Array.isArray(lookupRes)
@ -215,7 +215,7 @@ export function LogVisitForm({ client, onSuccess, onCancel, onActivityChange }:
activityId,
fieldId: 'daily_log',
formData: payload,
limit: SELECT_OPTION_LIMIT,
limit: 200,
});
const arr = Array.isArray(dailyLogLookupRes)

3
src/components/forms/fields/WfLookupField.tsx
View File

@ -1,6 +1,5 @@
import { useState, useEffect } from 'react';
import type { ZinoClient } from '../../../api/client';
import { SELECT_OPTION_LIMIT } from '../../../api/config';
import { SelectField } from './SelectField';
export interface WfLookupFieldProps {
@ -39,7 +38,7 @@ export function WfLookupField({ label, required, value, onChange, client, config
activityId,
fieldId,
formData,
limit: SELECT_OPTION_LIMIT
limit: 200
})
.then(res => {
if (!mounted) return;

6
src/components/maps/NearestStoresMap.tsx
View File

@ -64,7 +64,11 @@ export function NearestStoresMap() {
method: 'POST',
headers: {
'accept': 'application/json, text/plain, */*',
'content-type': 'application/json'
'content-type': 'application/json',
'groupid': '25',
'orgid': '57',
'templateid': '189',
'x-pipeline-version': 'latest'
},
body: JSON.stringify({
latitude: lat,

59
src/screens/DailySalesReportPage.tsx
View File

@ -5,8 +5,7 @@ import {
SALES_REPORT_ROUTES,
ROUTE_WISE_DISTRIBUTORS,
BASE_URL,
PIPELINE,
PDF_MAX_SKUS_PER_CHUNK
PIPELINE
} from '../api/config';
import { Download, Printer } from 'lucide-react';
import jsPDF from 'jspdf';
@ -74,56 +73,28 @@ export function DailySalesReportPage() {
// Meta Info
doc.setFontSize(10);
let leftY = 40;
if (distributor) {
doc.text(`Distributor Name : ${distributor}`, 14, leftY);
leftY += 5;
}
let rightY = 40;
if (date) {
doc.text(`Date : ${date}`, rightMargin, rightY, { align: 'right' });
rightY += 5;
}
if (soEmail) {
doc.text(`Distributor Name : ${distributor}`, 14, 40);
doc.text(`Date : ${date}`, rightMargin, 40, { align: 'right' });
const selectedSo = soOptions.find(o => o.value === soEmail);
doc.text(`SO Name : ${selectedSo ? selectedSo.label : soEmail}`, rightMargin, rightY, { align: 'right' });
rightY += 5;
}
doc.text(`SO Name : ${selectedSo ? selectedSo.label : soEmail}`, rightMargin, 45, { align: 'right' });
};
// Split headers into chunks of exactly PDF_MAX_SKUS_PER_CHUNK, even if it means splitting a brand.
// Split headers into chunks to avoid jspdf-autotable's horizontal page break bugs
// This allows us to keep the 2-tier header perfectly intact and break at heading boundaries.
const MAX_SKUS_PER_CHUNK = 14;
const headerChunks: any[][] = [];
let currentChunk: any[] = [];
let currentSkuCount = 0;
reportData?.response?.headers?.forEach((h: any) => {
const allSkus = h.skus || [];
if (allSkus.length === 0) return;
let remainingSkus = [...allSkus];
while (remainingSkus.length > 0) {
const availableSpace = PDF_MAX_SKUS_PER_CHUNK - currentSkuCount;
// Take as many SKUs as we can fit in the current chunk
const skusToTake = remainingSkus.splice(0, availableSpace);
currentChunk.push({
...h,
skus: skusToTake
});
currentSkuCount += skusToTake.length;
if (currentSkuCount >= PDF_MAX_SKUS_PER_CHUNK) {
const skus = h.skus || [];
if (currentSkuCount + skus.length > MAX_SKUS_PER_CHUNK && currentSkuCount > 0) {
headerChunks.push(currentChunk);
currentChunk = [];
currentSkuCount = 0;
}
}
currentChunk.push(h);
currentSkuCount += skus.length;
});
if (currentChunk.length > 0) {
headerChunks.push(currentChunk);
@ -328,12 +299,10 @@ export function DailySalesReportPage() {
</div>
<div className="flex justify-between items-start text-sm font-bold text-strong mb-2">
<div className="flex flex-col gap-1.5">
{distributor && <div>Distributor Name : {distributor}</div>}
</div>
<div>Distributor Name : {distributor}</div>
<div className="text-right flex flex-col gap-1.5">
{date && <div>Date : {date}</div>}
{soEmail && <div>SO Name : {soOptions.find(o => o.value === soEmail)?.label || soEmail}</div>}
<div>Date : {date}</div>
<div>SO Name : {soOptions.find(o => o.value === soEmail)?.label || soEmail}</div>
</div>
</div>