-
-
-
-
-
-
@@ -682,10 +683,12 @@ import { useRoute, useRouter } from 'vue-router'
import { useToast } from 'primevue/usetoast'
import { useReceiptsStore } from '../../stores/receiptsStore'
import { useCompanyStore } from '../../stores/companies'
+import { apiService } from '../../services/api'
import OCRUploadZone from '../../components/ocr/OCRUploadZone.vue'
import OCRPreview from '../../components/ocr/OCRPreview.vue'
import Dialog from 'primevue/dialog'
import Tag from 'primevue/tag'
+import Message from 'primevue/message'
import AutoComplete from 'primevue/autocomplete'
import Image from 'primevue/image'
@@ -744,6 +747,7 @@ const ocrUploadZone = ref(null)
const ocrData = ref(null)
const ocrFile = ref(null)
const ocrCollapsed = ref(false)
+const ocrRescanningId = ref(null) // ID of attachment being rescanned
// Edit mode file input ref
const editFileInput = ref(null)
@@ -753,9 +757,17 @@ const showCreateSupplierDialog = ref(false)
const pendingSupplierData = ref(null)
const supplierWarning = ref({ show: false, cui: '', name: '' })
+// Address collapsed state
+const showAddressExpanded = ref(false)
+
// OCR indicator for payment mode
const paymentSetFromOCR = ref(false)
+// Auto-detection state for direction (PLATĂ/ÎNCASARE)
+const directionAutoDetected = ref(false)
+const directionAutoReason = ref('') // e.g., "CUI furnizor = CUI firmă curentă"
+const missingClientWarning = ref(false)
+
// AutoComplete support
const filteredPartners = ref([])
const supplierSource = ref(null) // 'local', 'synced', or null
@@ -783,6 +795,28 @@ const isBalanced = computed(() => {
return Math.abs(totalDebit.value - totalCredit.value) < 0.01
})
+// Pre-validation computed states for visual indicators
+const validationState = computed(() => ({
+ hasAmount: form.value.amount && form.value.amount > 0,
+ hasDate: !!form.value.receipt_date,
+ hasExpenseType: !!form.value.expense_type_code,
+ hasPaymentMode: !!form.value.payment_mode,
+ hasAttachment: selectedFiles.value.length > 0 || existingAttachments.value.length > 0 || !!ocrFile.value,
+
+ // Cross-validation
+ amountMatchesPayments: !form.value.payment_methods?.length ||
+ Math.abs((form.value.amount || 0) - form.value.payment_methods.reduce((s, p) => s + (p.amount || 0), 0)) < 0.02
+}))
+
+const missingRequiredFields = computed(() => {
+ const missing = []
+ if (!validationState.value.hasAmount) missing.push('Suma')
+ if (!validationState.value.hasDate) missing.push('Data')
+ if (!validationState.value.hasExpenseType) missing.push('Tip cheltuiala')
+ if (!validationState.value.hasAttachment) missing.push('Atasament')
+ return missing
+})
+
// Payment mode options
const paymentModeOptions = ref([
{ value: 'casa', label: 'Casa (numerar firma)' },
@@ -790,6 +824,18 @@ const paymentModeOptions = ref([
{ value: 'avans_decontare', label: 'Avans Decontare (decont angajat)' },
])
+// Receipt type options (dropdown)
+const receiptTypeOptions = ref([
+ { value: 'bon_fiscal', label: 'Bon Fiscal' },
+ { value: 'chitanta', label: 'Chitanta' },
+])
+
+// Operation type / direction options (dropdown)
+const directionOptions = ref([
+ { value: 'cheltuiala', label: 'Cheltuiala (Plata)' },
+ { value: 'incasare', label: 'Incasare' },
+])
+
// AutoComplete search function
const searchPartners = (event) => {
const query = event.query.toLowerCase()
@@ -926,7 +972,101 @@ const onOCRError = (message) => {
})
}
+// Rescan existing attachment through OCR
+const rescanAttachmentOCR = async (attachment) => {
+ if (ocrRescanningId.value) return // Already processing
+
+ ocrRescanningId.value = attachment.id
+
+ try {
+ // Fetch the attachment blob
+ const response = await apiService.get(`/receipts/attachments/${attachment.id}/download`, {
+ responseType: 'blob',
+ })
+
+ // Create a File object from the blob
+ const file = new File([response.data], attachment.filename, { type: attachment.mime_type })
+
+ // Send to OCR
+ const formData = new FormData()
+ formData.append('file', file)
+
+ const ocrResponse = await apiService.post('/ocr/extract', formData, {
+ headers: { 'Content-Type': 'multipart/form-data' },
+ timeout: 60000,
+ })
+
+ if (ocrResponse.data.success) {
+ const resultData = {
+ ...ocrResponse.data.data,
+ _ocr_message: ocrResponse.data.message
+ }
+ ocrData.value = resultData
+ ocrCollapsed.value = false
+ toast.add({
+ severity: 'success',
+ summary: 'OCR Procesare',
+ detail: 'Datele au fost re-extrase din atasament',
+ life: 3000,
+ })
+ } else {
+ toast.add({
+ severity: 'error',
+ summary: 'Eroare OCR',
+ detail: ocrResponse.data.message || 'Procesare OCR esuata',
+ life: 5000,
+ })
+ }
+ } catch (error) {
+ const message = error.response?.data?.detail || error.message || 'Eroare la procesarea OCR'
+ toast.add({
+ severity: 'error',
+ summary: 'Eroare OCR',
+ detail: message,
+ life: 5000,
+ })
+ } finally {
+ ocrRescanningId.value = null
+ }
+}
+
const applyOCRData = async (data) => {
+ // Show warnings for problematic OCR data before applying
+
+ // Warning if amount not found
+ if (!data.amount || parseFloat(data.amount) <= 0) {
+ const paymentSum = data.payment_methods?.reduce((s, p) => s + parseFloat(p.amount || 0), 0) || 0
+ if (paymentSum > 0) {
+ toast.add({
+ severity: 'warn',
+ summary: 'Total nedetectat',
+ detail: `Totalul nu a fost extras. Suma din plati: ${paymentSum.toFixed(2)} LEI`,
+ life: 6000
+ })
+ } else {
+ toast.add({
+ severity: 'warn',
+ summary: 'Total nedetectat',
+ detail: 'Totalul nu a fost extras din OCR. Completati manual.',
+ life: 5000
+ })
+ }
+ }
+
+ // Warning if amount doesn't match payment methods sum
+ if (data.amount && data.payment_methods?.length > 0) {
+ const paymentSum = data.payment_methods.reduce((s, p) => s + parseFloat(p.amount || 0), 0)
+ const diff = Math.abs(parseFloat(data.amount) - paymentSum)
+ if (diff > 0.02) {
+ toast.add({
+ severity: 'warn',
+ summary: 'Diferenta detectata',
+ detail: `Total (${parseFloat(data.amount).toFixed(2)}) ≠ Plati (${paymentSum.toFixed(2)})`,
+ life: 5000
+ })
+ }
+ }
+
// Apply basic OCR data to form
if (data.receipt_type) {
form.value.receipt_type = data.receipt_type
@@ -977,7 +1117,103 @@ const applyOCRData = async (data) => {
paymentSetFromOCR.value = true // Show OCR indicator
}
- // Auto-search supplier by CUI if available
+ // AUTO-DETECT DIRECTION (PLATĂ/ÎNCASARE) based on CUI matching
+ const companyCui = companyStore.selectedCompany?.fiscal_code?.replace(/^RO/i, '')
+ const vendorCui = data.cui?.replace(/^RO/i, '')
+ const clientCui = data.client_cui?.replace(/^RO/i, '')
+
+ // Reset auto-detection state
+ directionAutoDetected.value = false
+ directionAutoReason.value = ''
+ missingClientWarning.value = false
+
+ if (vendorCui && companyCui && vendorCui === companyCui) {
+ // WE ARE THE VENDOR → ÎNCASARE (income)
+ form.value.direction = 'incasare'
+ directionAutoDetected.value = true
+ directionAutoReason.value = 'CUI furnizor = CUI firma curenta'
+
+ // Partner = CLIENT
+ if (data.client_name || data.client_cui) {
+ form.value.partner_name = data.client_name || ''
+ form.value.cui = data.client_cui || ''
+ form.value.vendor_address = data.client_address || ''
+
+ // Search for client in suppliers list
+ if (data.client_cui) {
+ const clientResult = await store.searchSupplier(data.client_cui)
+ if (clientResult.found && clientResult.supplier) {
+ form.value.partner_name = clientResult.supplier.name
+ form.value.cui = clientResult.supplier.fiscal_code || data.client_cui
+ form.value.vendor_address = clientResult.supplier.address || data.client_address || ''
+ supplierSource.value = clientResult.source
+
+ toast.add({
+ severity: 'success',
+ summary: 'Client gasit',
+ detail: `${clientResult.supplier.name} (${clientResult.source})`,
+ life: 3000,
+ })
+ }
+ }
+
+ toast.add({
+ severity: 'info',
+ summary: 'Incasare detectata',
+ detail: 'Firma curenta este furnizorul. Partenerul este clientul.',
+ life: 4000,
+ })
+ } else {
+ // NO CLIENT DATA - show warning
+ missingClientWarning.value = true
+ toast.add({
+ severity: 'warn',
+ summary: 'Lipsesc date client',
+ detail: 'Incasare detectata dar nu exista date client pe bon. Completeaza manual.',
+ life: 5000,
+ })
+ }
+
+ // Skip the normal supplier search below since we're using client as partner
+ toast.add({
+ severity: 'success',
+ summary: 'Date aplicate',
+ detail: 'Datele OCR au fost aplicate in formular',
+ life: 3000,
+ })
+ return
+
+ } else if (clientCui && companyCui && clientCui === companyCui) {
+ // WE ARE THE CLIENT → PLATĂ (expense) - standard purchase
+ form.value.direction = 'cheltuiala'
+ directionAutoDetected.value = true
+ directionAutoReason.value = 'CUI client = CUI firma curenta'
+ // Partner = VENDOR (continue to normal supplier search below)
+ } else if (clientCui && companyCui && clientCui !== companyCui) {
+ // Client CUI exists but doesn't match company CUI
+ // Check if it's a close match (possible OCR error - differs by 1-2 characters)
+ const similarity = calculateCuiSimilarity(clientCui, companyCui)
+ if (similarity >= 0.8) {
+ // Very similar - likely OCR error
+ toast.add({
+ severity: 'warn',
+ summary: 'CUI client similar',
+ detail: `CUI client (${clientCui}) este similar cu CUI firma (${companyCui}). Posibila eroare OCR.`,
+ life: 8000
+ })
+ } else if (clientCui.length >= 6) {
+ // Different CUI - show info
+ toast.add({
+ severity: 'info',
+ summary: 'CUI client diferit',
+ detail: `CUI client pe bon: ${clientCui}. CUI firma: ${companyCui}`,
+ life: 5000
+ })
+ }
+ }
+ // ELSE: Neither matches → default to CHELTUIALĂ, partner = vendor (normal flow)
+
+ // Auto-search supplier by CUI if available (vendor as partner)
if (data.cui) {
toast.add({
severity: 'info',
@@ -1101,6 +1337,35 @@ const cancelCreateSupplier = () => {
pendingSupplierData.value = null
}
+// Helper function to calculate similarity between two CUI strings
+// Returns a value between 0 and 1 (1 = identical)
+const calculateCuiSimilarity = (cui1, cui2) => {
+ if (!cui1 || !cui2) return 0
+ // Normalize: remove RO/R0 prefix (R0 is common OCR error for RO) and keep only digits
+ const norm1 = cui1.replace(/^R[O0]/i, '').replace(/\D/g, '')
+ const norm2 = cui2.replace(/^R[O0]/i, '').replace(/\D/g, '')
+
+ if (norm1.length === 0 || norm2.length === 0) return 0
+ if (norm1 === norm2) return 1
+
+ // Calculate character-by-character similarity
+ const maxLen = Math.max(norm1.length, norm2.length)
+ const minLen = Math.min(norm1.length, norm2.length)
+
+ // Length difference penalty
+ const lengthSimilarity = minLen / maxLen
+
+ // Character match count
+ let matches = 0
+ for (let i = 0; i < minLen; i++) {
+ if (norm1[i] === norm2[i]) matches++
+ }
+ const charSimilarity = matches / maxLen
+
+ // Combined similarity (weighted average)
+ return (charSimilarity * 0.8 + lengthSimilarity * 0.2)
+}
+
const onPartnerSelect = (event) => {
const partner = event.value
if (partner && typeof partner === 'object') {
@@ -1208,7 +1473,7 @@ const getStatusLabel = (status) => {
const labels = {
draft: 'Ciorna',
pending_review: 'In asteptare',
- approved: 'Aprobat',
+ approved: 'Validat',
rejected: 'Respins',
synced: 'Sincronizat',
}
@@ -1280,6 +1545,125 @@ const resubmitReceipt = async () => {
}
}
+// Workflow action states
+const approving = ref(false)
+const rejecting = ref(false)
+const unapproving = ref(false)
+const showRejectDialog = ref(false)
+const rejectReason = ref('')
+
+const approveReceipt = async () => {
+ approving.value = true
+ try {
+ const result = await store.approveReceipt(receipt.value.id)
+ if (result.success) {
+ toast.add({
+ severity: 'success',
+ summary: 'Succes',
+ detail: 'Bonul a fost validat',
+ life: 3000,
+ })
+ await loadReceipt()
+ } else {
+ toast.add({
+ severity: 'error',
+ summary: 'Eroare',
+ detail: result.message,
+ life: 5000,
+ })
+ }
+ } catch (error) {
+ toast.add({
+ severity: 'error',
+ summary: 'Eroare',
+ detail: error.message || 'Nu s-a putut valida bonul',
+ life: 5000,
+ })
+ } finally {
+ approving.value = false
+ }
+}
+
+const openRejectDialog = () => {
+ rejectReason.value = ''
+ showRejectDialog.value = true
+}
+
+const rejectReceipt = async () => {
+ if (!rejectReason.value || rejectReason.value.length < 5) {
+ toast.add({
+ severity: 'warn',
+ summary: 'Atentie',
+ detail: 'Motivul respingerii trebuie sa aiba minim 5 caractere',
+ life: 3000,
+ })
+ return
+ }
+
+ rejecting.value = true
+ try {
+ const result = await store.rejectReceipt(receipt.value.id, rejectReason.value)
+ if (result.success) {
+ toast.add({
+ severity: 'success',
+ summary: 'Succes',
+ detail: 'Bonul a fost respins',
+ life: 3000,
+ })
+ showRejectDialog.value = false
+ await loadReceipt()
+ } else {
+ toast.add({
+ severity: 'error',
+ summary: 'Eroare',
+ detail: result.message,
+ life: 5000,
+ })
+ }
+ } catch (error) {
+ toast.add({
+ severity: 'error',
+ summary: 'Eroare',
+ detail: error.message || 'Nu s-a putut respinge bonul',
+ life: 5000,
+ })
+ } finally {
+ rejecting.value = false
+ }
+}
+
+const unapproveReceipt = async () => {
+ unapproving.value = true
+ try {
+ const result = await store.unapproveReceipt(receipt.value.id)
+ if (result.success) {
+ toast.add({
+ severity: 'success',
+ summary: 'Succes',
+ detail: 'Validarea a fost anulata',
+ life: 3000,
+ })
+ await loadReceipt()
+ } else {
+ toast.add({
+ severity: 'error',
+ summary: 'Eroare',
+ detail: result.message,
+ life: 5000,
+ })
+ }
+ } catch (error) {
+ toast.add({
+ severity: 'error',
+ summary: 'Eroare',
+ detail: error.message || 'Nu s-a putut anula validarea',
+ life: 5000,
+ })
+ } finally {
+ unapproving.value = false
+ }
+}
+
const validateForm = () => {
// Check if we have at least one file (for new receipts)
// Also check ocrFile as a fallback (file selected for OCR processing)
@@ -1425,20 +1809,50 @@ const submitForReview = async () => {
diff --git a/start-data-entry-dev.sh b/start-data-entry-dev.sh
index 8d41dc3..2c99770 100644
--- a/start-data-entry-dev.sh
+++ b/start-data-entry-dev.sh
@@ -15,6 +15,10 @@ BLUE='\033[0;34m'
MAGENTA='\033[0;35m'
NC='\033[0m'
+# Get script directory
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
print_message() { echo -e "${BLUE}[DATA-ENTRY-PROD]${NC} $1"; }
print_success() { echo -e "${GREEN}[SUCCESS]${NC} $1"; }
print_warning() { echo -e "${YELLOW}[WARNING]${NC} $1"; }
@@ -25,39 +29,191 @@ check_port() {
lsof -Pi :$port -sTCP:LISTEN -t >/dev/null 2>&1
}
+# Individual service functions
+stop_frontend() {
+ if check_port 3010; then
+ print_message "Stopping frontend..."
+ lsof -ti:3010 | xargs kill -TERM 2>/dev/null || true
+ sleep 1
+ lsof -ti:3010 | xargs kill -KILL 2>/dev/null || true
+ pkill -f "vite.*3010" 2>/dev/null || true
+ print_success "Frontend stopped"
+ else
+ print_warning "Frontend not running"
+ fi
+}
+
+stop_backend() {
+ if check_port 8003; then
+ print_message "Stopping backend..."
+ lsof -ti:8003 | xargs kill -TERM 2>/dev/null || true
+ sleep 1
+ lsof -ti:8003 | xargs kill -KILL 2>/dev/null || true
+ pkill -f "uvicorn.*8003" 2>/dev/null || true
+ print_success "Backend stopped"
+ else
+ print_warning "Backend not running"
+ fi
+}
+
+start_frontend() {
+ if check_port 3010; then
+ print_warning "Frontend already running on port 3010"
+ return 0
+ fi
+
+ print_message "Starting Frontend (Vue.js)..."
+ cd "$SCRIPT_DIR/data-entry-app/frontend/"
+
+ if [ ! -d "node_modules" ] || [ -f "node_modules/.bin/vite.cmd" ]; then
+ print_message "Installing frontend dependencies..."
+ rm -rf node_modules package-lock.json 2>/dev/null
+ npm install
+ fi
+
+ # Clear Vite cache for clean start
+ rm -rf node_modules/.vite 2>/dev/null || true
+
+ npm run dev -- --port 3010 > /tmp/data_entry_frontend.log 2>&1 &
+
+ for i in {1..15}; do
+ if check_port 3010; then
+ print_success "Frontend started on http://localhost:3010"
+ cd "$SCRIPT_DIR"
+ return 0
+ fi
+ sleep 1
+ done
+
+ print_error "Frontend failed to start"
+ cat /tmp/data_entry_frontend.log
+ cd "$SCRIPT_DIR"
+ return 1
+}
+
+start_backend() {
+ if check_port 8003; then
+ print_warning "Backend already running on port 8003"
+ return 0
+ fi
+
+ print_message "Starting Backend (FastAPI)..."
+ cd "$SCRIPT_DIR/data-entry-app/backend/"
+
+ if [ ! -d "venv" ]; then
+ print_message "Creating virtual environment..."
+ python3 -m venv venv
+ fi
+
+ source venv/bin/activate
+
+ if ! python -c "import fastapi, uvicorn, sqlmodel" 2>/dev/null; then
+ print_message "Installing backend dependencies..."
+ pip install --upgrade pip > /dev/null 2>&1
+ pip install -r requirements.txt
+ fi
+
+ mkdir -p data/uploads
+
+ print_message "Running migrations..."
+ alembic upgrade head 2>/dev/null || print_warning "Migrations may already be applied"
+
+ uvicorn app.main:app --host 0.0.0.0 --port 8003 --reload > /tmp/data_entry_backend.log 2>&1 &
+
+ for i in {1..20}; do
+ if check_port 8003; then
+ print_success "Backend started on http://localhost:8003"
+ cd "$SCRIPT_DIR"
+ return 0
+ fi
+ sleep 1
+ done
+
+ print_error "Backend failed to start"
+ cat /tmp/data_entry_backend.log
+ cd "$SCRIPT_DIR"
+ return 1
+}
+
cleanup() {
print_message "Stopping services..."
- [[ -n $BACKEND_PID ]] && kill $BACKEND_PID 2>/dev/null || true
- [[ -n $FRONTEND_PID ]] && kill $FRONTEND_PID 2>/dev/null || true
+ stop_frontend
+ stop_backend
./ssh_tunnel.sh stop 2>/dev/null || true
print_success "All services stopped."
exit 0
}
stop_services() {
- print_message "Stopping all Data Entry PRODUCTION services..."
+ local target=${1:-all}
- if check_port 8003; then
- lsof -ti:8003 | xargs kill -TERM 2>/dev/null || true
- sleep 2
- lsof -ti:8003 | xargs kill -KILL 2>/dev/null || true
- print_success "Backend stopped"
- fi
+ case $target in
+ frontend|fe|f)
+ stop_frontend
+ ;;
+ backend|be|b)
+ stop_backend
+ ;;
+ all|"")
+ print_message "Stopping all Data Entry PRODUCTION services..."
+ stop_frontend
+ stop_backend
+ ./ssh_tunnel.sh stop 2>/dev/null || true
+ print_success "All Data Entry PRODUCTION services stopped!"
+ ;;
+ *)
+ print_error "Unknown target: $target (use: frontend, backend, all)"
+ exit 1
+ ;;
+ esac
+}
- if check_port 3010; then
- lsof -ti:3010 | xargs kill -TERM 2>/dev/null || true
- sleep 2
- lsof -ti:3010 | xargs kill -KILL 2>/dev/null || true
- print_success "Frontend stopped"
- fi
+start_services() {
+ local target=${1:-all}
- ./ssh_tunnel.sh stop 2>/dev/null || true
+ case $target in
+ frontend|fe|f)
+ start_frontend
+ ;;
+ backend|be|b)
+ # Ensure .env is correct
+ cp "$SCRIPT_DIR/data-entry-app/backend/.env.prod" "$SCRIPT_DIR/data-entry-app/backend/.env" 2>/dev/null || true
+ start_backend
+ ;;
+ all|"")
+ start_all
+ ;;
+ *)
+ print_error "Unknown target: $target (use: frontend, backend, all)"
+ exit 1
+ ;;
+ esac
+}
- pkill -f "uvicorn.*data-entry" 2>/dev/null || true
- pkill -f "vite.*3010" 2>/dev/null || true
+restart_services() {
+ local target=${1:-all}
- print_success "All Data Entry PRODUCTION services stopped!"
- exit 0
+ case $target in
+ frontend|fe|f)
+ stop_frontend
+ sleep 1
+ start_frontend
+ ;;
+ backend|be|b)
+ stop_backend
+ sleep 1
+ start_backend
+ ;;
+ all|"")
+ stop_services all
+ sleep 2
+ start_all
+ ;;
+ *)
+ print_error "Unknown target: $target (use: frontend, backend, all)"
+ exit 1
+ ;;
+ esac
}
show_status() {
@@ -97,9 +253,21 @@ show_usage() {
echo -e "${MAGENTA}Data Entry App - PRODUCTION Starter${NC}"
echo
echo "Usage:"
- echo " ./start-data-entry-dev.sh Start all services"
- echo " ./start-data-entry-dev.sh stop Stop all services"
- echo " ./start-data-entry-dev.sh status Show status"
+ echo " ./start-data-entry-dev.sh Start all services"
+ echo " ./start-data-entry-dev.sh stop [target] Stop services"
+ echo " ./start-data-entry-dev.sh start [target] Start services"
+ echo " ./start-data-entry-dev.sh restart [target] Restart services"
+ echo " ./start-data-entry-dev.sh status Show status"
+ echo
+ echo "Targets:"
+ echo " frontend, fe, f Frontend only (Vue.js on port 3010)"
+ echo " backend, be, b Backend only (FastAPI on port 8003)"
+ echo " all (default) All services"
+ echo
+ echo "Examples:"
+ echo " ./start-data-entry-dev.sh restart frontend Restart only frontend"
+ echo " ./start-data-entry-dev.sh stop backend Stop only backend"
+ echo " ./start-data-entry-dev.sh start fe Start frontend (short)"
echo
echo "Environment:"
echo " Oracle Server: 10.0.20.36 (PRODUCTION)"
@@ -109,116 +277,95 @@ show_usage() {
echo
}
+start_all() {
+ trap cleanup SIGINT SIGTERM
+
+ echo -e "${MAGENTA}═══════════════════════════════════════════${NC}"
+ echo -e "${MAGENTA} Data Entry App - PRODUCTION Environment${NC}"
+ echo -e "${MAGENTA} Oracle: 10.0.20.36 | DB: receipts_prod.db${NC}"
+ echo -e "${MAGENTA}═══════════════════════════════════════════${NC}"
+ echo
+
+ # Step 1: Stop any TEST tunnel and start PRODUCTION tunnel
+ print_message "1. Setting up SSH Tunnel (PRODUCTION)..."
+ ./ssh-tunnel-test.sh stop 2>/dev/null || true
+ sleep 1
+
+ if ./ssh_tunnel.sh start; then
+ print_success "SSH Tunnel to PRODUCTION (10.0.20.36) started"
+ else
+ print_error "Failed to start SSH tunnel"
+ exit 1
+ fi
+ sleep 2
+
+ # Step 2: Copy PRODUCTION .env
+ print_message "2. Loading PRODUCTION environment..."
+ cp data-entry-app/backend/.env.prod data-entry-app/backend/.env
+ print_success "Loaded .env.prod (receipts_prod.db)"
+
+ # Step 3: Start Frontend
+ print_message "3. Starting Frontend..."
+ start_frontend
+
+ # Step 4: Start Backend
+ print_message "4. Starting Backend..."
+ start_backend
+
+ # Summary
+ echo
+ echo -e "${GREEN}═══════════════════════════════════════════${NC}"
+ echo -e "${GREEN} Data Entry PRODUCTION Environment Ready!${NC}"
+ echo -e "${GREEN}═══════════════════════════════════════════${NC}"
+ echo
+ echo -e "${BLUE}Services:${NC}"
+ echo " • SSH Tunnel: 10.0.20.36 (PRODUCTION)"
+ echo " • Backend: http://localhost:8003"
+ echo " • Frontend: http://localhost:3010"
+ echo " • API Docs: http://localhost:8003/docs"
+ echo
+ echo -e "${BLUE}Database:${NC}"
+ echo " • SQLite: data/receipts_prod.db"
+ echo " • Test Company: ROMFAST (company_id=114)"
+ echo
+ echo -e "${YELLOW}Press Ctrl+C to stop all services${NC}"
+ echo
+
+ wait
+}
+
# Parse arguments
case $1 in
- stop) stop_services ;;
- status) show_status; exit 0 ;;
- help|--help|-h) show_usage; exit 0 ;;
- "") ;; # Continue to start
- *) print_error "Unknown: $1"; show_usage; exit 1 ;;
+ stop)
+ stop_services "$2"
+ exit 0
+ ;;
+ start)
+ if [ -z "$2" ] || [ "$2" = "all" ]; then
+ start_all
+ else
+ start_services "$2"
+ fi
+ exit 0
+ ;;
+ restart)
+ restart_services "$2"
+ exit 0
+ ;;
+ status)
+ show_status
+ exit 0
+ ;;
+ help|--help|-h)
+ show_usage
+ exit 0
+ ;;
+ "")
+ start_all
+ ;;
+ *)
+ print_error "Unknown command: $1"
+ show_usage
+ exit 1
+ ;;
esac
-
-trap cleanup SIGINT SIGTERM
-
-echo -e "${MAGENTA}═══════════════════════════════════════════${NC}"
-echo -e "${MAGENTA} Data Entry App - PRODUCTION Environment${NC}"
-echo -e "${MAGENTA} Oracle: 10.0.20.36 | DB: receipts_prod.db${NC}"
-echo -e "${MAGENTA}═══════════════════════════════════════════${NC}"
-echo
-
-# Step 1: Stop any TEST tunnel and start PRODUCTION tunnel
-print_message "1. Setting up SSH Tunnel (PRODUCTION)..."
-./ssh-tunnel-test.sh stop 2>/dev/null || true
-sleep 1
-
-if ./ssh_tunnel.sh start; then
- print_success "SSH Tunnel to PRODUCTION (10.0.20.36) started"
-else
- print_error "Failed to start SSH tunnel"
- exit 1
-fi
-sleep 2
-
-# Step 2: Copy PRODUCTION .env
-print_message "2. Loading PRODUCTION environment..."
-cp data-entry-app/backend/.env.prod data-entry-app/backend/.env
-print_success "Loaded .env.prod (receipts_prod.db)"
-
-# Step 3: Start Frontend
-print_message "3. Starting Frontend (Vue.js)..."
-
-cd data-entry-app/frontend/
-
-if [ ! -d "node_modules" ] || [ -f "node_modules/.bin/vite.cmd" ]; then
- print_message "Installing frontend dependencies..."
- rm -rf node_modules package-lock.json 2>/dev/null
- npm install
-fi
-
-npm run dev -- --port 3010 > /tmp/data_entry_frontend.log 2>&1 &
-FRONTEND_PID=$!
-
-for i in {1..15}; do
- if check_port 3010; then
- print_success "Frontend started on http://localhost:3010"
- break
- fi
- [ $i -eq 15 ] && { print_error "Frontend failed"; cat /tmp/data_entry_frontend.log; cleanup; }
- sleep 1
-done
-
-# Step 4: Start Backend
-print_message "4. Starting Backend (FastAPI)..."
-
-cd ../backend/
-
-if [ ! -d "venv" ]; then
- print_message "Creating virtual environment..."
- python3 -m venv venv
-fi
-
-source venv/bin/activate
-
-if ! python -c "import fastapi, uvicorn, sqlmodel" 2>/dev/null; then
- print_message "Installing backend dependencies..."
- pip install --upgrade pip > /dev/null 2>&1
- pip install -r requirements.txt
-fi
-
-mkdir -p data/uploads
-
-print_message "Running migrations..."
-alembic upgrade head 2>/dev/null || print_warning "Migrations may already be applied"
-
-uvicorn app.main:app --host 0.0.0.0 --port 8003 --reload > /tmp/data_entry_backend.log 2>&1 &
-BACKEND_PID=$!
-
-for i in {1..20}; do
- if check_port 8003; then
- print_success "Backend started on http://localhost:8003"
- break
- fi
- [ $i -eq 20 ] && { print_error "Backend failed"; cat /tmp/data_entry_backend.log; cleanup; }
- sleep 1
-done
-
-# Summary
-echo
-echo -e "${GREEN}═══════════════════════════════════════════${NC}"
-echo -e "${GREEN} Data Entry PRODUCTION Environment Ready!${NC}"
-echo -e "${GREEN}═══════════════════════════════════════════${NC}"
-echo
-echo -e "${BLUE}Services:${NC}"
-echo " • SSH Tunnel: 10.0.20.36 (PRODUCTION)"
-echo " • Backend: http://localhost:8003"
-echo " • Frontend: http://localhost:3010"
-echo " • API Docs: http://localhost:8003/docs"
-echo
-echo -e "${BLUE}Database:${NC}"
-echo " • SQLite: data/receipts_prod.db"
-echo " • Test Company: ROMFAST (company_id=114)"
-echo
-echo -e "${YELLOW}Press Ctrl+C to stop all services${NC}"
-echo
-
-wait
diff --git a/start-data-entry-test.sh b/start-data-entry-test.sh
index a67d7f2..4095a7e 100644
--- a/start-data-entry-test.sh
+++ b/start-data-entry-test.sh
@@ -15,6 +15,10 @@ BLUE='\033[0;34m'
CYAN='\033[0;36m'
NC='\033[0m'
+# Get script directory
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
print_message() { echo -e "${CYAN}[DATA-ENTRY-TEST]${NC} $1"; }
print_success() { echo -e "${GREEN}[SUCCESS]${NC} $1"; }
print_warning() { echo -e "${YELLOW}[WARNING]${NC} $1"; }
@@ -25,39 +29,191 @@ check_port() {
lsof -Pi :$port -sTCP:LISTEN -t >/dev/null 2>&1
}
+# Individual service functions
+stop_frontend() {
+ if check_port 3010; then
+ print_message "Stopping frontend..."
+ lsof -ti:3010 | xargs kill -TERM 2>/dev/null || true
+ sleep 1
+ lsof -ti:3010 | xargs kill -KILL 2>/dev/null || true
+ pkill -f "vite.*3010" 2>/dev/null || true
+ print_success "Frontend stopped"
+ else
+ print_warning "Frontend not running"
+ fi
+}
+
+stop_backend() {
+ if check_port 8003; then
+ print_message "Stopping backend..."
+ lsof -ti:8003 | xargs kill -TERM 2>/dev/null || true
+ sleep 1
+ lsof -ti:8003 | xargs kill -KILL 2>/dev/null || true
+ pkill -f "uvicorn.*8003" 2>/dev/null || true
+ print_success "Backend stopped"
+ else
+ print_warning "Backend not running"
+ fi
+}
+
+start_frontend() {
+ if check_port 3010; then
+ print_warning "Frontend already running on port 3010"
+ return 0
+ fi
+
+ print_message "Starting Frontend (Vue.js)..."
+ cd "$SCRIPT_DIR/data-entry-app/frontend/"
+
+ if [ ! -d "node_modules" ] || [ -f "node_modules/.bin/vite.cmd" ]; then
+ print_message "Installing frontend dependencies..."
+ rm -rf node_modules package-lock.json 2>/dev/null
+ npm install
+ fi
+
+ # Clear Vite cache for clean start
+ rm -rf node_modules/.vite 2>/dev/null || true
+
+ npm run dev -- --port 3010 > /tmp/data_entry_frontend.log 2>&1 &
+
+ for i in {1..15}; do
+ if check_port 3010; then
+ print_success "Frontend started on http://localhost:3010"
+ cd "$SCRIPT_DIR"
+ return 0
+ fi
+ sleep 1
+ done
+
+ print_error "Frontend failed to start"
+ cat /tmp/data_entry_frontend.log
+ cd "$SCRIPT_DIR"
+ return 1
+}
+
+start_backend() {
+ if check_port 8003; then
+ print_warning "Backend already running on port 8003"
+ return 0
+ fi
+
+ print_message "Starting Backend (FastAPI)..."
+ cd "$SCRIPT_DIR/data-entry-app/backend/"
+
+ if [ ! -d "venv" ]; then
+ print_message "Creating virtual environment..."
+ python3 -m venv venv
+ fi
+
+ source venv/bin/activate
+
+ if ! python -c "import fastapi, uvicorn, sqlmodel" 2>/dev/null; then
+ print_message "Installing backend dependencies..."
+ pip install --upgrade pip > /dev/null 2>&1
+ pip install -r requirements.txt
+ fi
+
+ mkdir -p data/uploads
+
+ print_message "Running migrations..."
+ alembic upgrade head 2>/dev/null || print_warning "Migrations may already be applied"
+
+ uvicorn app.main:app --host 0.0.0.0 --port 8003 --reload > /tmp/data_entry_backend.log 2>&1 &
+
+ for i in {1..20}; do
+ if check_port 8003; then
+ print_success "Backend started on http://localhost:8003"
+ cd "$SCRIPT_DIR"
+ return 0
+ fi
+ sleep 1
+ done
+
+ print_error "Backend failed to start"
+ cat /tmp/data_entry_backend.log
+ cd "$SCRIPT_DIR"
+ return 1
+}
+
cleanup() {
print_message "Stopping services..."
- [[ -n $BACKEND_PID ]] && kill $BACKEND_PID 2>/dev/null || true
- [[ -n $FRONTEND_PID ]] && kill $FRONTEND_PID 2>/dev/null || true
+ stop_frontend
+ stop_backend
./ssh-tunnel-test.sh stop 2>/dev/null || true
print_success "All services stopped."
exit 0
}
stop_services() {
- print_message "Stopping all Data Entry TEST services..."
+ local target=${1:-all}
- if check_port 8003; then
- lsof -ti:8003 | xargs kill -TERM 2>/dev/null || true
- sleep 2
- lsof -ti:8003 | xargs kill -KILL 2>/dev/null || true
- print_success "Backend stopped"
- fi
+ case $target in
+ frontend|fe|f)
+ stop_frontend
+ ;;
+ backend|be|b)
+ stop_backend
+ ;;
+ all|"")
+ print_message "Stopping all Data Entry TEST services..."
+ stop_frontend
+ stop_backend
+ ./ssh-tunnel-test.sh stop 2>/dev/null || true
+ print_success "All Data Entry TEST services stopped!"
+ ;;
+ *)
+ print_error "Unknown target: $target (use: frontend, backend, all)"
+ exit 1
+ ;;
+ esac
+}
- if check_port 3010; then
- lsof -ti:3010 | xargs kill -TERM 2>/dev/null || true
- sleep 2
- lsof -ti:3010 | xargs kill -KILL 2>/dev/null || true
- print_success "Frontend stopped"
- fi
+start_services() {
+ local target=${1:-all}
- ./ssh-tunnel-test.sh stop 2>/dev/null || true
+ case $target in
+ frontend|fe|f)
+ start_frontend
+ ;;
+ backend|be|b)
+ # Ensure .env is correct
+ cp "$SCRIPT_DIR/data-entry-app/backend/.env.test" "$SCRIPT_DIR/data-entry-app/backend/.env" 2>/dev/null || true
+ start_backend
+ ;;
+ all|"")
+ start_all
+ ;;
+ *)
+ print_error "Unknown target: $target (use: frontend, backend, all)"
+ exit 1
+ ;;
+ esac
+}
- pkill -f "uvicorn.*data-entry" 2>/dev/null || true
- pkill -f "vite.*3010" 2>/dev/null || true
+restart_services() {
+ local target=${1:-all}
- print_success "All Data Entry TEST services stopped!"
- exit 0
+ case $target in
+ frontend|fe|f)
+ stop_frontend
+ sleep 1
+ start_frontend
+ ;;
+ backend|be|b)
+ stop_backend
+ sleep 1
+ start_backend
+ ;;
+ all|"")
+ stop_services all
+ sleep 2
+ start_all
+ ;;
+ *)
+ print_error "Unknown target: $target (use: frontend, backend, all)"
+ exit 1
+ ;;
+ esac
}
show_status() {
@@ -97,9 +253,21 @@ show_usage() {
echo -e "${CYAN}Data Entry App - TEST Starter${NC}"
echo
echo "Usage:"
- echo " ./start-data-entry-test.sh Start all services"
- echo " ./start-data-entry-test.sh stop Stop all services"
- echo " ./start-data-entry-test.sh status Show status"
+ echo " ./start-data-entry-test.sh Start all services"
+ echo " ./start-data-entry-test.sh stop [target] Stop services"
+ echo " ./start-data-entry-test.sh start [target] Start services"
+ echo " ./start-data-entry-test.sh restart [target] Restart services"
+ echo " ./start-data-entry-test.sh status Show status"
+ echo
+ echo "Targets:"
+ echo " frontend, fe, f Frontend only (Vue.js on port 3010)"
+ echo " backend, be, b Backend only (FastAPI on port 8003)"
+ echo " all (default) All services"
+ echo
+ echo "Examples:"
+ echo " ./start-data-entry-test.sh restart frontend Restart only frontend"
+ echo " ./start-data-entry-test.sh stop backend Stop only backend"
+ echo " ./start-data-entry-test.sh start fe Start frontend (short)"
echo
echo "Environment:"
echo " Oracle Server: 10.0.20.121 (TEST)"
@@ -109,116 +277,95 @@ show_usage() {
echo
}
+start_all() {
+ trap cleanup SIGINT SIGTERM
+
+ echo -e "${CYAN}═══════════════════════════════════════════${NC}"
+ echo -e "${CYAN} Data Entry App - TEST Environment${NC}"
+ echo -e "${CYAN} Oracle: 10.0.20.121 | DB: receipts_test.db${NC}"
+ echo -e "${CYAN}═══════════════════════════════════════════${NC}"
+ echo
+
+ # Step 1: Stop any PRODUCTION tunnel and start TEST tunnel
+ print_message "1. Setting up SSH Tunnel (TEST)..."
+ ./ssh_tunnel.sh stop 2>/dev/null || true
+ sleep 1
+
+ if ./ssh-tunnel-test.sh start; then
+ print_success "SSH Tunnel to TEST (10.0.20.121) started"
+ else
+ print_error "Failed to start SSH tunnel"
+ exit 1
+ fi
+ sleep 2
+
+ # Step 2: Copy TEST .env
+ print_message "2. Loading TEST environment..."
+ cp data-entry-app/backend/.env.test data-entry-app/backend/.env
+ print_success "Loaded .env.test (receipts_test.db)"
+
+ # Step 3: Start Frontend
+ print_message "3. Starting Frontend..."
+ start_frontend
+
+ # Step 4: Start Backend
+ print_message "4. Starting Backend..."
+ start_backend
+
+ # Summary
+ echo
+ echo -e "${GREEN}═══════════════════════════════════════════${NC}"
+ echo -e "${GREEN} Data Entry TEST Environment Ready!${NC}"
+ echo -e "${GREEN}═══════════════════════════════════════════${NC}"
+ echo
+ echo -e "${CYAN}Services:${NC}"
+ echo " • SSH Tunnel: 10.0.20.121 (TEST)"
+ echo " • Backend: http://localhost:8003"
+ echo " • Frontend: http://localhost:3010"
+ echo " • API Docs: http://localhost:8003/docs"
+ echo
+ echo -e "${CYAN}Database:${NC}"
+ echo " • SQLite: data/receipts_test.db"
+ echo " • Test Company: MARIUSM_AUTO (company_id=110)"
+ echo
+ echo -e "${YELLOW}Press Ctrl+C to stop all services${NC}"
+ echo
+
+ wait
+}
+
# Parse arguments
case $1 in
- stop) stop_services ;;
- status) show_status; exit 0 ;;
- help|--help|-h) show_usage; exit 0 ;;
- "") ;; # Continue to start
- *) print_error "Unknown: $1"; show_usage; exit 1 ;;
+ stop)
+ stop_services "$2"
+ exit 0
+ ;;
+ start)
+ if [ -z "$2" ] || [ "$2" = "all" ]; then
+ start_all
+ else
+ start_services "$2"
+ fi
+ exit 0
+ ;;
+ restart)
+ restart_services "$2"
+ exit 0
+ ;;
+ status)
+ show_status
+ exit 0
+ ;;
+ help|--help|-h)
+ show_usage
+ exit 0
+ ;;
+ "")
+ start_all
+ ;;
+ *)
+ print_error "Unknown command: $1"
+ show_usage
+ exit 1
+ ;;
esac
-
-trap cleanup SIGINT SIGTERM
-
-echo -e "${CYAN}═══════════════════════════════════════════${NC}"
-echo -e "${CYAN} Data Entry App - TEST Environment${NC}"
-echo -e "${CYAN} Oracle: 10.0.20.121 | DB: receipts_test.db${NC}"
-echo -e "${CYAN}═══════════════════════════════════════════${NC}"
-echo
-
-# Step 1: Stop any PRODUCTION tunnel and start TEST tunnel
-print_message "1. Setting up SSH Tunnel (TEST)..."
-./ssh_tunnel.sh stop 2>/dev/null || true
-sleep 1
-
-if ./ssh-tunnel-test.sh start; then
- print_success "SSH Tunnel to TEST (10.0.20.121) started"
-else
- print_error "Failed to start SSH tunnel"
- exit 1
-fi
-sleep 2
-
-# Step 2: Copy TEST .env
-print_message "2. Loading TEST environment..."
-cp data-entry-app/backend/.env.test data-entry-app/backend/.env
-print_success "Loaded .env.test (receipts_test.db)"
-
-# Step 3: Start Frontend
-print_message "3. Starting Frontend (Vue.js)..."
-
-cd data-entry-app/frontend/
-
-if [ ! -d "node_modules" ] || [ -f "node_modules/.bin/vite.cmd" ]; then
- print_message "Installing frontend dependencies..."
- rm -rf node_modules package-lock.json 2>/dev/null
- npm install
-fi
-
-npm run dev -- --port 3010 > /tmp/data_entry_frontend.log 2>&1 &
-FRONTEND_PID=$!
-
-for i in {1..15}; do
- if check_port 3010; then
- print_success "Frontend started on http://localhost:3010"
- break
- fi
- [ $i -eq 15 ] && { print_error "Frontend failed"; cat /tmp/data_entry_frontend.log; cleanup; }
- sleep 1
-done
-
-# Step 4: Start Backend
-print_message "4. Starting Backend (FastAPI)..."
-
-cd ../backend/
-
-if [ ! -d "venv" ]; then
- print_message "Creating virtual environment..."
- python3 -m venv venv
-fi
-
-source venv/bin/activate
-
-if ! python -c "import fastapi, uvicorn, sqlmodel" 2>/dev/null; then
- print_message "Installing backend dependencies..."
- pip install --upgrade pip > /dev/null 2>&1
- pip install -r requirements.txt
-fi
-
-mkdir -p data/uploads
-
-print_message "Running migrations..."
-alembic upgrade head 2>/dev/null || print_warning "Migrations may already be applied"
-
-uvicorn app.main:app --host 0.0.0.0 --port 8003 --reload > /tmp/data_entry_backend.log 2>&1 &
-BACKEND_PID=$!
-
-for i in {1..20}; do
- if check_port 8003; then
- print_success "Backend started on http://localhost:8003"
- break
- fi
- [ $i -eq 20 ] && { print_error "Backend failed"; cat /tmp/data_entry_backend.log; cleanup; }
- sleep 1
-done
-
-# Summary
-echo
-echo -e "${GREEN}═══════════════════════════════════════════${NC}"
-echo -e "${GREEN} Data Entry TEST Environment Ready!${NC}"
-echo -e "${GREEN}═══════════════════════════════════════════${NC}"
-echo
-echo -e "${CYAN}Services:${NC}"
-echo " • SSH Tunnel: 10.0.20.121 (TEST)"
-echo " • Backend: http://localhost:8003"
-echo " • Frontend: http://localhost:3010"
-echo " • API Docs: http://localhost:8003/docs"
-echo
-echo -e "${CYAN}Database:${NC}"
-echo " • SQLite: data/receipts_test.db"
-echo " • Test Company: MARIUSM_AUTO (company_id=110)"
-echo
-echo -e "${YELLOW}Press Ctrl+C to stop all services${NC}"
-echo
-
-wait