ATMATA/zerp
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates for contacts & tenders Modules

Browse Source
This commit is contained in:
yotakii
2026-04-01 15:50:21 +03:00
parent 278d8f6982
commit f101989047
12 changed files with 850 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/app/contacts/[id]/page.tsx
View File

@@ -100,6 +100,7 @@ function ContactDetailContent() {
HOLDING: 'bg-purple-100 text-purple-700',
GOVERNMENT: 'bg-orange-100 text-orange-700',
ORGANIZATION: 'bg-cyan-100 text-cyan-700',
EMBASSIES: 'bg-red-100 text-red-700',
BANK: 'bg-emerald-100 text-emerald-700',
UNIVERSITY: 'bg-indigo-100 text-indigo-700',
SCHOOL: 'bg-yellow-100 text-yellow-700',
@@ -119,6 +120,7 @@ function ContactDetailContent() {
ORGANIZATION: 'منظمات - Organizations',
BANK: 'بنوك - Banks',
UNIVERSITY: 'جامعات - Universities',
EMBASSIES: 'سفارات - Embassies',
SCHOOL: 'مدارس - Schools',
UN: 'UN - United Nations',
NGO: 'NGO - Non-Governmental Organization',

1
frontend/src/app/contacts/page.tsx
View File

@@ -387,6 +387,7 @@ function ContactsContent() {
<option value="HOLDING">Holdings</option>
<option value="GOVERNMENT">Government</option>
<option value="ORGANIZATION">Organizations</option>
<option value="EMBASSIES">Embassies</option>
<option value="BANK">Banks</option>
<option value="UNIVERSITY">Universities</option>
<option value="SCHOOL">Schools</option>

2
frontend/src/app/hr/page.tsx
View File

@@ -277,7 +277,7 @@ function HRContent() {
mobile: '',
dateOfBirth: '',
gender: '',
nationality: 'Saudi Arabia',
nationality: 'Syria',
nationalId: '',
employmentType: 'FULL_TIME',
contractType: 'UNLIMITED',

273
frontend/src/app/tenders/[id]/page.tsx
View File

@@ -10,14 +10,13 @@ import {
Calendar,
Building2,
DollarSign,
User,
History,
Plus,
Loader2,
CheckCircle2,
Upload,
ExternalLink,
AlertCircle,
MapPin,
} from 'lucide-react'
import ProtectedRoute from '@/components/ProtectedRoute'
import LoadingSpinner from '@/components/LoadingSpinner'
@@ -51,8 +50,16 @@ function TenderDetailContent() {
const [employees, setEmployees] = useState<any[]>([])
const [contacts, setContacts] = useState<any[]>([])
const [pipelines, setPipelines] = useState<any[]>([])
const [directiveForm, setDirectiveForm] = useState<CreateDirectiveData>({ type: 'BUY_TERMS', assignedToEmployeeId: '', notes: '' })
const [convertForm, setConvertForm] = useState({ contactId: '', pipelineId: '', ownerId: '' })
const [directiveForm, setDirectiveForm] = useState<CreateDirectiveData>({
type: 'BUY_TERMS',
assignedToEmployeeId: '',
notes: '',
})
const [convertForm, setConvertForm] = useState({
contactId: '',
pipelineId: '',
ownerId: '',
})
const [completeNotes, setCompleteNotes] = useState('')
const [directiveTypeValues, setDirectiveTypeValues] = useState<string[]>([])
const [submitting, setSubmitting] = useState(false)
@@ -93,10 +100,17 @@ function TenderDetailContent() {
useEffect(() => {
if (showDirectiveModal || showConvertModal) {
employeesAPI.getAll({ status: 'ACTIVE', pageSize: 500 }).then((r: any) => setEmployees(r.employees || [])).catch(() => {})
employeesAPI
.getAll({ status: 'ACTIVE', pageSize: 500 })
.then((r: any) => setEmployees(r.employees || []))
.catch(() => {})
}
if (showConvertModal) {
contactsAPI.getAll({ pageSize: 500 }).then((r: any) => setContacts(r.contacts || [])).catch(() => {})
contactsAPI
.getAll({ pageSize: 500 })
.then((r: any) => setContacts(r.contacts || []))
.catch(() => {})
pipelinesAPI.getAll().then(setPipelines).catch(() => {})
}
}, [showDirectiveModal, showConvertModal])
@@ -107,6 +121,7 @@ function TenderDetailContent() {
toast.error(t('tenders.assignee') + ' ' + t('common.required'))
return
}
setSubmitting(true)
try {
await tendersAPI.createDirective(tenderId, directiveForm)
@@ -124,9 +139,13 @@ function TenderDetailContent() {
const handleCompleteDirective = async (e: React.FormEvent) => {
e.preventDefault()
if (!showCompleteModal) return
setSubmitting(true)
try {
await tendersAPI.updateDirective(showCompleteModal.id, { status: 'COMPLETED', completionNotes: completeNotes })
await tendersAPI.updateDirective(showCompleteModal.id, {
status: 'COMPLETED',
completionNotes: completeNotes,
})
toast.success('Task completed')
setShowCompleteModal(null)
setCompleteNotes('')
@@ -144,6 +163,7 @@ function TenderDetailContent() {
toast.error('Contact and Pipeline are required')
return
}
setSubmitting(true)
try {
const deal = await tendersAPI.convertToDeal(tenderId, convertForm)
@@ -160,6 +180,7 @@ function TenderDetailContent() {
const handleTenderFileUpload = async (e: React.ChangeEvent<HTMLInputElement>) => {
const file = e.target.files?.[0]
if (!file) return
setSubmitting(true)
try {
await tendersAPI.uploadTenderAttachment(tenderId, file)
@@ -183,7 +204,9 @@ function TenderDetailContent() {
const directiveId = directiveIdForUpload
e.target.value = ''
setDirectiveIdForUpload(null)
if (!file || !directiveId) return
setUploadingDirectiveId(directiveId)
try {
await tendersAPI.uploadDirectiveAttachment(directiveId, file)
@@ -220,10 +243,13 @@ function TenderDetailContent() {
<ArrowLeft className="h-5 w-5" />
</Link>
<div>
<h1 className="text-2xl font-bold text-gray-900">{tender.tenderNumber} – {tender.title}</h1>
<h1 className="text-2xl font-bold text-gray-900">
{tender.tenderNumber} – {tender.title}
</h1>
<p className="text-sm text-gray-600">{tender.issuingBodyName}</p>
</div>
</div>
{tender.status === 'ACTIVE' && (
<button
onClick={() => setShowConvertModal(true)}
@@ -242,7 +268,9 @@ function TenderDetailContent() {
key={tab.id}
onClick={() => setActiveTab(tab.id as any)}
className={`flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium ${
activeTab === tab.id ? 'bg-indigo-100 text-indigo-800' : 'text-gray-600 hover:bg-gray-100'
activeTab === tab.id
? 'bg-indigo-100 text-indigo-800'
: 'text-gray-600 hover:bg-gray-100'
}`}
>
<tab.icon className="h-4 w-4" />
@@ -262,6 +290,7 @@ function TenderDetailContent() {
<p>{tender.announcementDate?.split('T')[0]}</p>
</div>
</div>
<div className="flex items-start gap-2">
<Calendar className="h-5 w-5 text-gray-400 mt-0.5" />
<div>
@@ -269,6 +298,7 @@ function TenderDetailContent() {
<p>{tender.closingDate?.split('T')[0]}</p>
</div>
</div>
<div className="flex items-start gap-2">
<DollarSign className="h-5 w-5 text-gray-400 mt-0.5" />
<div>
@@ -276,21 +306,71 @@ function TenderDetailContent() {
<p>{Number(tender.termsValue)} SAR</p>
</div>
</div>
<div className="flex items-start gap-2">
<DollarSign className="h-5 w-5 text-gray-400 mt-0.5" />
<div>
<p className="text-xs text-gray-500">{t('tenders.bondValue')}</p>
<p>{Number(tender.bondValue)} SAR</p>
<p className="text-xs text-gray-500">التأمينات الأولية</p>
<p>{Number(tender.initialBondValue || tender.bondValue || 0)} SAR</p>
</div>
</div>
<div className="flex items-start gap-2">
<DollarSign className="h-5 w-5 text-gray-400 mt-0.5" />
<div>
<p className="text-xs text-gray-500">التأمينات النهائية</p>
<p>{Number(tender.finalBondValue || 0)} SAR</p>
</div>
</div>
<div className="flex items-start gap-2">
<Calendar className="h-5 w-5 text-gray-400 mt-0.5" />
<div>
<p className="text-xs text-gray-500">زمن الاسترجاع</p>
<p>{tender.finalBondRefundPeriod || '-'}</p>
</div>
</div>
<div className="flex items-start gap-2">
<Calendar className="h-5 w-5 text-gray-400 mt-0.5" />
<div>
<p className="text-xs text-gray-500">زيارة الموقع</p>
<p>{tender.siteVisitRequired ? 'إجبارية' : 'غير إجبارية'}</p>
</div>
</div>
{tender.siteVisitRequired && (
<div className="flex items-start gap-2">
<MapPin className="h-5 w-5 text-gray-400 mt-0.5" />
<div>
<p className="text-xs text-gray-500">مكان الزيارة</p>
<p>{tender.siteVisitLocation || '-'}</p>
</div>
</div>
)}
<div className="flex items-start gap-2">
<MapPin className="h-5 w-5 text-gray-400 mt-0.5" />
<div>
<p className="text-xs text-gray-500">مكان استلام دفتر الشروط</p>
<p>{tender.termsPickupProvince || '-'}</p>
</div>
</div>
</div>
{tender.announcementLink && (
<p>
<a href={tender.announcementLink} target="_blank" rel="noopener noreferrer" className="text-indigo-600 hover:underline">
<a
href={tender.announcementLink}
target="_blank"
rel="noopener noreferrer"
className="text-indigo-600 hover:underline"
>
{t('tenders.announcementLink')}
</a>
</p>
)}
{tender.notes && (
<div>
<p className="text-xs text-gray-500">{t('common.notes')}</p>
@@ -312,19 +392,29 @@ function TenderDetailContent() {
{t('tenders.addDirective')}
</button>
</div>
{!tender.directives?.length ? (
<p className="text-gray-500">{t('common.noData')}</p>
) : (
<ul className="space-y-3">
{tender.directives.map((d) => (
<li key={d.id} className="border rounded-lg p-4 flex flex-wrap items-center justify-between gap-2">
<li
key={d.id}
className="border rounded-lg p-4 flex flex-wrap items-center justify-between gap-2"
>
<div>
<p className="font-medium">{DIRECTIVE_TYPE_LABELS[d.type] || d.type}</p>
<p className="text-sm text-gray-600">
{d.assignedToEmployee ? `${d.assignedToEmployee.firstName} ${d.assignedToEmployee.lastName}` : ''} · {d.status}
{d.assignedToEmployee
? `${d.assignedToEmployee.firstName} ${d.assignedToEmployee.lastName}`
: ''}{' '}
· {d.status}
</p>
{d.completionNotes && <p className="text-sm mt-1">{d.completionNotes}</p>}
{d.completionNotes && (
<p className="text-sm mt-1">{d.completionNotes}</p>
)}
</div>
<div className="flex items-center gap-2">
{d.status !== 'COMPLETED' && d.assignedToEmployee?.user?.id && (
<button
@@ -334,19 +424,25 @@ function TenderDetailContent() {
{t('tenders.completeTask')}
</button>
)}
<input
type="file"
ref={directiveFileInputRef}
className="hidden"
onChange={handleDirectiveFileUpload}
/>
<button
type="button"
onClick={() => handleDirectiveFileSelect(d.id)}
disabled={uploadingDirectiveId === d.id}
className="text-sm text-indigo-600 hover:underline flex items-center gap-1"
>
{uploadingDirectiveId === d.id ? <Loader2 className="h-4 w-4 animate-spin" /> : <Upload className="h-4 w-4" />}
{uploadingDirectiveId === d.id ? (
<Loader2 className="h-4 w-4 animate-spin" />
) : (
<Upload className="h-4 w-4" />
)}
{t('tenders.uploadFile')}
</button>
</div>
@@ -371,17 +467,49 @@ function TenderDetailContent() {
disabled={submitting}
className="flex items-center gap-2 px-4 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700 disabled:opacity-50"
>
{submitting ? <Loader2 className="h-4 w-4 animate-spin" /> : <Upload className="h-4 w-4" />}
{submitting ? (
<Loader2 className="h-4 w-4 animate-spin" />
) : (
<Upload className="h-4 w-4" />
)}
{t('tenders.uploadFile')}
</button>
</div>
{!tender.attachments?.length ? (
<p className="text-gray-500">{t('common.noData')}</p>
) : (
<ul className="space-y-2">
{tender.attachments.map((a: any) => (
<li key={a.id} className="text-sm text-gray-700">
{a.originalName || a.fileName}
<li
key={a.id}
className="flex items-center justify-between border rounded px-3 py-2"
>
<a
href={`${process.env.NEXT_PUBLIC_API_URL}/tenders/attachments/${a.id}/view`}
target="_blank"
rel="noopener noreferrer"
className="text-sm text-indigo-600 hover:underline flex items-center gap-1"
>
<ExternalLink className="h-4 w-4" />
{a.originalName || a.fileName}
</a>
<button
onClick={async () => {
if (!confirm('حذف الملف؟')) return
try {
await tendersAPI.deleteAttachment(a.id)
toast.success('تم الحذف')
fetchTender()
} catch {
toast.error('فشل الحذف')
}
}}
className="text-red-600 text-sm hover:underline"
>
حذف
</button>
</li>
))}
</ul>
@@ -397,7 +525,8 @@ function TenderDetailContent() {
<ul className="space-y-2">
{history.map((h: any) => (
<li key={h.id} className="text-sm border-b border-gray-100 pb-2">
<span className="font-medium">{h.action}</span> · {h.user?.username} · {h.createdAt?.split('T')[0]}
<span className="font-medium">{h.action}</span> · {h.user?.username} ·{' '}
{h.createdAt?.split('T')[0]}
</li>
))}
</ul>
@@ -408,36 +537,54 @@ function TenderDetailContent() {
</div>
</div>
<Modal isOpen={showDirectiveModal} onClose={() => setShowDirectiveModal(false)} title={t('tenders.addDirective')}>
<Modal
isOpen={showDirectiveModal}
onClose={() => setShowDirectiveModal(false)}
title={t('tenders.addDirective')}
>
<form onSubmit={handleAddDirective} className="space-y-4">
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.directiveType')}</label>
<label className="block text-sm font-medium text-gray-700 mb-1">
{t('tenders.directiveType')}
</label>
<select
value={directiveForm.type}
onChange={(e) => setDirectiveForm({ ...directiveForm, type: e.target.value })}
className="w-full px-3 py-2 border rounded-lg"
>
{directiveTypeValues.map((v) => (
<option key={v} value={v}>{DIRECTIVE_TYPE_LABELS[v] || v}</option>
<option key={v} value={v}>
{DIRECTIVE_TYPE_LABELS[v] || v}
</option>
))}
</select>
</div>
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.assignee')} *</label>
<label className="block text-sm font-medium text-gray-700 mb-1">
{t('tenders.assignee')} *
</label>
<select
value={directiveForm.assignedToEmployeeId}
onChange={(e) => setDirectiveForm({ ...directiveForm, assignedToEmployeeId: e.target.value })}
onChange={(e) =>
setDirectiveForm({ ...directiveForm, assignedToEmployeeId: e.target.value })
}
className="w-full px-3 py-2 border rounded-lg"
required
>
<option value="">Select employee</option>
{employees.map((emp) => (
<option key={emp.id} value={emp.id}>{emp.firstName} {emp.lastName}</option>
<option key={emp.id} value={emp.id}>
{emp.firstName} {emp.lastName}
</option>
))}
</select>
</div>
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">{t('common.notes')}</label>
<label className="block text-sm font-medium text-gray-700 mb-1">
{t('common.notes')}
</label>
<textarea
value={directiveForm.notes || ''}
onChange={(e) => setDirectiveForm({ ...directiveForm, notes: e.target.value })}
@@ -445,9 +592,20 @@ function TenderDetailContent() {
rows={2}
/>
</div>
<div className="flex justify-end gap-2">
<button type="button" onClick={() => setShowDirectiveModal(false)} className="px-4 py-2 border rounded-lg">{t('common.cancel')}</button>
<button type="submit" disabled={submitting} className="px-4 py-2 bg-indigo-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2">
<button
type="button"
onClick={() => setShowDirectiveModal(false)}
className="px-4 py-2 border rounded-lg"
>
{t('common.cancel')}
</button>
<button
type="submit"
disabled={submitting}
className="px-4 py-2 bg-indigo-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2"
>
{submitting && <Loader2 className="h-4 w-4 animate-spin" />}
{t('common.save')}
</button>
@@ -455,10 +613,16 @@ function TenderDetailContent() {
</form>
</Modal>
<Modal isOpen={!!showCompleteModal} onClose={() => setShowCompleteModal(null)} title={t('tenders.completeTask')}>
<Modal
isOpen={!!showCompleteModal}
onClose={() => setShowCompleteModal(null)}
title={t('tenders.completeTask')}
>
<form onSubmit={handleCompleteDirective} className="space-y-4">
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.completionNotes')}</label>
<label className="block text-sm font-medium text-gray-700 mb-1">
{t('tenders.completionNotes')}
</label>
<textarea
value={completeNotes}
onChange={(e) => setCompleteNotes(e.target.value)}
@@ -466,9 +630,20 @@ function TenderDetailContent() {
rows={3}
/>
</div>
<div className="flex justify-end gap-2">
<button type="button" onClick={() => setShowCompleteModal(null)} className="px-4 py-2 border rounded-lg">{t('common.cancel')}</button>
<button type="submit" disabled={submitting} className="px-4 py-2 bg-green-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2">
<button
type="button"
onClick={() => setShowCompleteModal(null)}
className="px-4 py-2 border rounded-lg"
>
{t('common.cancel')}
</button>
<button
type="submit"
disabled={submitting}
className="px-4 py-2 bg-green-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2"
>
{submitting && <Loader2 className="h-4 w-4 animate-spin" />}
{t('common.save')}
</button>
@@ -476,7 +651,11 @@ function TenderDetailContent() {
</form>
</Modal>
<Modal isOpen={showConvertModal} onClose={() => setShowConvertModal(false)} title={t('tenders.convertToDeal')}>
<Modal
isOpen={showConvertModal}
onClose={() => setShowConvertModal(false)}
title={t('tenders.convertToDeal')}
>
<form onSubmit={handleConvertToDeal} className="space-y-4">
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">Contact *</label>
@@ -488,10 +667,13 @@ function TenderDetailContent() {
>
<option value="">Select contact</option>
{contacts.map((c) => (
<option key={c.id} value={c.id}>{c.name}</option>
<option key={c.id} value={c.id}>
{c.name}
</option>
))}
</select>
</div>
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">Pipeline *</label>
<select
@@ -502,13 +684,26 @@ function TenderDetailContent() {
>
<option value="">Select pipeline</option>
{pipelines.map((p) => (
<option key={p.id} value={p.id}>{p.name}</option>
<option key={p.id} value={p.id}>
{p.name}
</option>
))}
</select>
</div>
<div className="flex justify-end gap-2">
<button type="button" onClick={() => setShowConvertModal(false)} className="px-4 py-2 border rounded-lg">{t('common.cancel')}</button>
<button type="submit" disabled={submitting} className="px-4 py-2 bg-green-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2">
<button
type="button"
onClick={() => setShowConvertModal(false)}
className="px-4 py-2 border rounded-lg"
>
{t('common.cancel')}
</button>
<button
type="submit"
disabled={submitting}
className="px-4 py-2 bg-green-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2"
>
{submitting && <Loader2 className="h-4 w-4 animate-spin" />}
{t('tenders.convertToDeal')}
</button>
@@ -525,4 +720,4 @@ export default function TenderDetailPage() {
<TenderDetailContent />
</ProtectedRoute>
)
}
}

400
frontend/src/app/tenders/page.tsx
View File

@@ -10,9 +10,6 @@ import {
FileText,
Plus,
Search,
Calendar,
Building2,
DollarSign,
AlertCircle,
ArrowLeft,
Eye,
@@ -32,6 +29,23 @@ const SOURCE_LABELS: Record<string, string> = {
MANUAL: 'Manual entry',
}
const SYRIA_PROVINCES = [
'دمشق',
'ريف دمشق',
'حلب',
'حمص',
'حماة',
'اللاذقية',
'طرطوس',
'إدلب',
'درعا',
'السويداء',
'القنيطرة',
'دير الزور',
'الرقة',
'الحسكة',
]
const ANNOUNCEMENT_LABELS: Record<string, string> = {
FIRST: 'First announcement',
RE_ANNOUNCEMENT_2: 'Re-announcement 2nd',
@@ -39,6 +53,27 @@ const ANNOUNCEMENT_LABELS: Record<string, string> = {
RE_ANNOUNCEMENT_4: 'Re-announcement 4th',
}
const getInitialFormData = (): CreateTenderData => ({
tenderNumber: '',
issuingBodyName: '',
title: '',
termsValue: 0,
bondValue: 0,
initialBondValue: 0,
finalBondValue: 0,
finalBondRefundPeriod: '',
siteVisitRequired: false,
siteVisitLocation: '',
termsPickupProvince: '',
announcementDate: '',
closingDate: '',
source: 'MANUAL',
announcementType: 'FIRST',
notes: '',
})
function TendersContent() {
const { t } = useLanguage()
const [tenders, setTenders] = useState<Tender[]>([])
@@ -50,17 +85,8 @@ function TendersContent() {
const [searchTerm, setSearchTerm] = useState('')
const [selectedStatus, setSelectedStatus] = useState('all')
const [showCreateModal, setShowCreateModal] = useState(false)
const [formData, setFormData] = useState<CreateTenderData>({
tenderNumber: '',
issuingBodyName: '',
title: '',
termsValue: 0,
bondValue: 0,
announcementDate: '',
closingDate: '',
source: 'MANUAL',
announcementType: 'FIRST',
})
const [formData, setFormData] = useState<CreateTenderData>(getInitialFormData())
const [formErrors, setFormErrors] = useState<Record<string, string>>({})
const [submitting, setSubmitting] = useState(false)
const [possibleDuplicates, setPossibleDuplicates] = useState<Tender[]>([])
@@ -68,12 +94,20 @@ function TendersContent() {
const [sourceValues, setSourceValues] = useState<string[]>([])
const [announcementTypeValues, setAnnouncementTypeValues] = useState<string[]>([])
const resetForm = () => {
setFormData(getInitialFormData())
setFormErrors({})
setPossibleDuplicates([])
setShowDuplicateWarning(false)
}
const fetchTenders = useCallback(async () => {
setLoading(true)
try {
const filters: TenderFilters = { page: currentPage, pageSize }
if (searchTerm) filters.search = searchTerm
if (selectedStatus !== 'all') filters.status = selectedStatus
const data = await tendersAPI.getAll(filters)
setTenders(data.tenders)
setTotal(data.total)
@@ -96,24 +130,39 @@ function TendersContent() {
const handleCreate = async (e: React.FormEvent) => {
e.preventDefault()
const errors: Record<string, string> = {}
if (!formData.tenderNumber?.trim()) errors.tenderNumber = t('common.required')
if (!formData.issuingBodyName?.trim()) errors.issuingBodyName = t('common.required')
if (!formData.title?.trim()) errors.title = t('common.required')
if (!formData.announcementDate) errors.announcementDate = t('common.required')
if (!formData.closingDate) errors.closingDate = t('common.required')
//if (Number(formData.termsValue) < 0) errors.termsValue = t('common.required')
if (Number(formData.bondValue) < 0) errors.bondValue = t('common.required')
if (Number(formData.initialBondValue || 0) < 0) {
errors.initialBondValue = t('common.required')
}
if (formData.siteVisitRequired && !formData.siteVisitLocation?.trim()) {
errors.siteVisitLocation = t('common.required')
}
setFormErrors(errors)
if (Object.keys(errors).length > 0) return
setSubmitting(true)
try {
const result = await tendersAPI.create(formData)
const result = await tendersAPI.create({
...formData,
bondValue: Number(formData.initialBondValue ?? formData.bondValue ?? 0),
})
if (result.possibleDuplicates && result.possibleDuplicates.length > 0) {
setPossibleDuplicates(result.possibleDuplicates)
setShowDuplicateWarning(true)
toast(t('tenders.duplicateWarning') || 'Possible duplicates found. Please review.', { icon: '⚠️' })
toast(t('tenders.duplicateWarning') || 'Possible duplicates found. Please review.', {
icon: '⚠️',
})
} else {
toast.success(t('tenders.createSuccess') || 'Tender created successfully')
setShowCreateModal(false)
@@ -127,23 +176,6 @@ function TendersContent() {
}
}
const resetForm = () => {
setFormData({
tenderNumber: '',
issuingBodyName: '',
title: '',
termsValue: 0,
bondValue: 0,
announcementDate: '',
closingDate: '',
source: 'MANUAL',
announcementType: 'FIRST',
})
setFormErrors({})
setPossibleDuplicates([])
setShowDuplicateWarning(false)
}
return (
<div className="min-h-screen bg-gray-50">
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
@@ -155,16 +187,25 @@ function TendersContent() {
>
<ArrowLeft className="h-5 w-5" />
</Link>
<div className="flex items-center gap-2">
<FileText className="h-8 w-8 text-indigo-600" />
<div>
<h1 className="text-2xl font-bold text-gray-900">{t('nav.tenders') || 'Tenders'}</h1>
<p className="text-sm text-gray-600">{t('tenders.subtitle') || 'Tender Management'}</p>
<h1 className="text-2xl font-bold text-gray-900">
{t('nav.tenders') || 'Tenders'}
</h1>
<p className="text-sm text-gray-600">
{t('tenders.subtitle') || 'Tender Management'}
</p>
</div>
</div>
</div>
<button
onClick={() => { setShowCreateModal(true); resetForm(); }}
onClick={() => {
resetForm()
setShowCreateModal(true)
}}
className="flex items-center gap-2 px-4 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700"
>
<Plus className="h-5 w-5" />
@@ -184,6 +225,7 @@ function TendersContent() {
className="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500"
/>
</div>
<select
value={selectedStatus}
onChange={(e) => setSelectedStatus(e.target.value)}
@@ -209,26 +251,52 @@ function TendersContent() {
<table className="min-w-full divide-y divide-gray-200">
<thead className="bg-gray-50">
<tr>
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">{t('tenders.tenderNumber') || 'Number'}</th>
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">{t('tenders.title') || 'Title'}</th>
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">{t('tenders.issuingBody') || 'Issuing body'}</th>
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">{t('tenders.closingDate') || 'Closing date'}</th>
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">{t('common.status')}</th>
<th className="px-4 py-3 text-right text-xs font-medium text-gray-500 uppercase">{t('common.actions')}</th>
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
{t('tenders.tenderNumber') || 'Number'}
</th>
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
{t('tenders.title') || 'Title'}
</th>
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
{t('tenders.issuingBody') || 'Issuing body'}
</th>
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
{t('tenders.closingDate') || 'Closing date'}
</th>
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
{t('common.status')}
</th>
<th className="px-4 py-3 text-right text-xs font-medium text-gray-500 uppercase">
{t('common.actions')}
</th>
</tr>
</thead>
<tbody className="bg-white divide-y divide-gray-200">
{tenders.map((tender) => (
<tr key={tender.id} className="hover:bg-gray-50">
<td className="px-4 py-3 text-sm font-medium text-gray-900">{tender.tenderNumber}</td>
<td className="px-4 py-3 text-sm text-gray-900">{tender.title}</td>
<td className="px-4 py-3 text-sm text-gray-600">{tender.issuingBodyName}</td>
<td className="px-4 py-3 text-sm text-gray-600">{tender.closingDate?.split('T')[0]}</td>
<td className="px-4 py-3 text-sm font-medium text-gray-900">
{tender.tenderNumber}
</td>
<td className="px-4 py-3 text-sm text-gray-900">
{tender.title}
</td>
<td className="px-4 py-3 text-sm text-gray-600">
{tender.issuingBodyName}
</td>
<td className="px-4 py-3 text-sm text-gray-600">
{tender.closingDate?.split('T')[0]}
</td>
<td className="px-4 py-3">
<span className={`px-2 py-1 text-xs rounded-full ${
tender.status === 'ACTIVE' ? 'bg-green-100 text-green-800' :
tender.status === 'CONVERTED_TO_DEAL' ? 'bg-blue-100 text-blue-800' : 'bg-gray-100 text-gray-800'
}`}>
<span
className={`px-2 py-1 text-xs rounded-full ${
tender.status === 'ACTIVE'
? 'bg-green-100 text-green-800'
: tender.status === 'CONVERTED_TO_DEAL'
? 'bg-blue-100 text-blue-800'
: 'bg-gray-100 text-gray-800'
}`}
>
{tender.status}
</span>
</td>
@@ -251,7 +319,8 @@ function TendersContent() {
{totalPages > 1 && (
<div className="px-4 py-3 border-t border-gray-200 flex items-center justify-between">
<p className="text-sm text-gray-600">
{t('common.showing') || 'Showing'} {(currentPage - 1) * pageSize + 1}–{Math.min(currentPage * pageSize, total)} {t('common.of') || 'of'} {total}
{t('common.showing') || 'Showing'} {(currentPage - 1) * pageSize + 1}–
{Math.min(currentPage * pageSize, total)} {t('common.of') || 'of'} {total}
</p>
<div className="flex gap-2">
<button
@@ -276,113 +345,259 @@ function TendersContent() {
<Modal
isOpen={showCreateModal}
onClose={() => { setShowCreateModal(false); setShowDuplicateWarning(false); resetForm(); }}
onClose={() => {
setShowCreateModal(false)
resetForm()
}}
title={t('tenders.addTender') || 'Add Tender'}
>
<form onSubmit={handleCreate} className="space-y-4">
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.tenderNumber')} *</label>
<label className="block text-sm font-medium text-gray-700 mb-1">
{t('tenders.tenderNumber')} *
</label>
<input
type="text"
value={formData.tenderNumber}
onChange={(e) => setFormData({ ...formData, tenderNumber: e.target.value })}
className="w-full px-3 py-2 border rounded-lg"
/>
{formErrors.tenderNumber && <p className="text-red-500 text-xs mt-1">{formErrors.tenderNumber}</p>}
{formErrors.tenderNumber && (
<p className="text-red-500 text-xs mt-1">{formErrors.tenderNumber}</p>
)}
</div>
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.issuingBody')} *</label>
<label className="block text-sm font-medium text-gray-700 mb-1">
{t('tenders.issuingBody')} *
</label>
<input
type="text"
value={formData.issuingBodyName}
onChange={(e) => setFormData({ ...formData, issuingBodyName: e.target.value })}
className="w-full px-3 py-2 border rounded-lg"
/>
{formErrors.issuingBodyName && <p className="text-red-500 text-xs mt-1">{formErrors.issuingBodyName}</p>}
{formErrors.issuingBodyName && (
<p className="text-red-500 text-xs mt-1">{formErrors.issuingBodyName}</p>
)}
</div>
</div>
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.titleLabel')} *</label>
<label className="block text-sm font-medium text-gray-700 mb-1">
{t('tenders.titleLabel')} *
</label>
<input
type="text"
value={formData.title}
onChange={(e) => setFormData({ ...formData, title: e.target.value })}
className="w-full px-3 py-2 border rounded-lg"
/>
{formErrors.title && <p className="text-red-500 text-xs mt-1">{formErrors.title}</p>}
{formErrors.title && (
<p className="text-red-500 text-xs mt-1">{formErrors.title}</p>
)}
</div>
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.termsValue')} *</label>
<input
type="number"
value={formData.termsValue || ''}
onChange={(e) => setFormData({ ...formData, termsValue: Number(e.target.value) || 0 })}
className="w-full px-3 py-2 border rounded-lg"
/>
</div>
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.bondValue')} *</label>
<label className="block text-sm font-medium text-gray-700 mb-1">
قيمة دفتر الشروط *
</label>
<input
type="number"
min={0}
value={formData.bondValue || ''}
onChange={(e) => setFormData({ ...formData, bondValue: Number(e.target.value) || 0 })}
value={formData.termsValue || ''}
onChange={(e) =>
setFormData({ ...formData, termsValue: Number(e.target.value) || 0 })
}
className="w-full px-3 py-2 border rounded-lg"
/>
</div>
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">
قيمة التأمينات الأولية *
</label>
<input
type="number"
min={0}
value={formData.initialBondValue || ''}
onChange={(e) =>
setFormData({
...formData,
initialBondValue: Number(e.target.value) || 0,
bondValue: Number(e.target.value) || 0,
})
}
className="w-full px-3 py-2 border rounded-lg"
/>
{formErrors.initialBondValue && (
<p className="text-red-500 text-xs mt-1">{formErrors.initialBondValue}</p>
)}
</div>
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">
قيمة التأمينات النهائية
</label>
<input
type="number"
min={0}
value={formData.finalBondValue || ''}
onChange={(e) =>
setFormData({ ...formData, finalBondValue: Number(e.target.value) || 0 })
}
className="w-full px-3 py-2 border rounded-lg"
/>
</div>
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">
زمن الاسترجاع
</label>
<input
type="text"
value={formData.finalBondRefundPeriod || ''}
onChange={(e) =>
setFormData({ ...formData, finalBondRefundPeriod: e.target.value })
}
placeholder="مثال: بعد 90 يوم من التسليم النهائي"
className="w-full px-3 py-2 border rounded-lg"
/>
</div>
</div>
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.announcementDate')} *</label>
<label className="block text-sm font-medium text-gray-700 mb-1">
{t('tenders.announcementDate')} *
</label>
<input
type="date"
value={formData.announcementDate}
onChange={(e) => setFormData({ ...formData, announcementDate: e.target.value })}
className="w-full px-3 py-2 border rounded-lg"
/>
{formErrors.announcementDate && <p className="text-red-500 text-xs mt-1">{formErrors.announcementDate}</p>}
{formErrors.announcementDate && (
<p className="text-red-500 text-xs mt-1">{formErrors.announcementDate}</p>
)}
</div>
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.closingDate')} *</label>
<label className="block text-sm font-medium text-gray-700 mb-1">
{t('tenders.closingDate')} *
</label>
<input
type="date"
value={formData.closingDate}
onChange={(e) => setFormData({ ...formData, closingDate: e.target.value })}
className="w-full px-3 py-2 border rounded-lg"
/>
{formErrors.closingDate && <p className="text-red-500 text-xs mt-1">{formErrors.closingDate}</p>}
{formErrors.closingDate && (
<p className="text-red-500 text-xs mt-1">{formErrors.closingDate}</p>
)}
</div>
</div>
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.source')}</label>
<label className="block text-sm font-medium text-gray-700 mb-1">
{t('tenders.source')}
</label>
<select
value={formData.source}
onChange={(e) => setFormData({ ...formData, source: e.target.value })}
className="w-full px-3 py-2 border rounded-lg"
>
{sourceValues.map((s) => (
<option key={s} value={s}>{SOURCE_LABELS[s] || s}</option>
<option key={s} value={s}>
{SOURCE_LABELS[s] || s}
</option>
))}
</select>
</div>
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.announcementType')}</label>
<label className="block text-sm font-medium text-gray-700 mb-1">
{t('tenders.announcementType')}
</label>
<select
value={formData.announcementType}
onChange={(e) => setFormData({ ...formData, announcementType: e.target.value })}
className="w-full px-3 py-2 border rounded-lg"
>
{announcementTypeValues.map((a) => (
<option key={a} value={a}>{ANNOUNCEMENT_LABELS[a] || a}</option>
<option key={a} value={a}>
{ANNOUNCEMENT_LABELS[a] || a}
</option>
))}
</select>
</div>
</div>
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">
زيارة الموقع
</label>
<select
value={formData.siteVisitRequired ? 'YES' : 'NO'}
onChange={(e) =>
setFormData({
...formData,
siteVisitRequired: e.target.value === 'YES',
siteVisitLocation: e.target.value === 'YES' ? formData.siteVisitLocation || '' : '',
})
}
className="w-full px-3 py-2 border rounded-lg"
>
<option value="NO">غير إجبارية</option>
<option value="YES">إجبارية</option>
</select>
</div>
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">
مكان استلام دفتر الشروط - المحافظة
</label>
<select
value={formData.termsPickupProvince || ''}
onChange={(e) => setFormData({ ...formData, termsPickupProvince: e.target.value })}
className="w-full px-3 py-2 border rounded-lg"
>
<option value="">اختر المحافظة</option>
{SYRIA_PROVINCES.map((province) => (
<option key={province} value={province}>
{province}
</option>
))}
</select>
</div>
</div>
{formData.siteVisitRequired && (
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">
مكان الزيارة *
</label>
<input
type="text"
value={formData.siteVisitLocation || ''}
onChange={(e) => setFormData({ ...formData, siteVisitLocation: e.target.value })}
className="w-full px-3 py-2 border rounded-lg"
placeholder="اكتب مكان أو عنوان زيارة الموقع"
/>
{formErrors.siteVisitLocation && (
<p className="text-red-500 text-xs mt-1">{formErrors.siteVisitLocation}</p>
)}
</div>
)}
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.announcementLink')}</label>
<label className="block text-sm font-medium text-gray-700 mb-1">
{t('tenders.announcementLink')}
</label>
<input
type="url"
value={formData.announcementLink || ''}
@@ -390,8 +605,11 @@ function TendersContent() {
className="w-full px-3 py-2 border rounded-lg"
/>
</div>
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">{t('common.notes')}</label>
<label className="block text-sm font-medium text-gray-700 mb-1">
{t('common.notes')}
</label>
<textarea
value={formData.notes || ''}
onChange={(e) => setFormData({ ...formData, notes: e.target.value })}
@@ -399,29 +617,39 @@ function TendersContent() {
rows={2}
/>
</div>
{showDuplicateWarning && possibleDuplicates.length > 0 && (
<div className="p-3 bg-amber-50 border border-amber-200 rounded-lg flex items-start gap-2">
<AlertCircle className="h-5 w-5 text-amber-600 flex-shrink-0 mt-0.5" />
<div>
<p className="text-sm font-medium text-amber-800">{t('tenders.duplicateWarning') || 'Possible duplicates found'}</p>
<p className="text-sm font-medium text-amber-800">
{t('tenders.duplicateWarning') || 'Possible duplicates found'}
</p>
<ul className="text-sm text-amber-700 mt-1 list-disc list-inside">
{possibleDuplicates.slice(0, 3).map((d) => (
<li key={d.id}>
<Link href={`/tenders/${d.id}`} className="underline">{d.tenderNumber} - {d.title}</Link>
<Link href={`/tenders/${d.id}`} className="underline">
{d.tenderNumber} - {d.title}
</Link>
</li>
))}
</ul>
</div>
</div>
)}
<div className="flex justify-end gap-2 pt-4">
<button
type="button"
onClick={() => { setShowCreateModal(false); resetForm(); }}
onClick={() => {
setShowCreateModal(false)
resetForm()
}}
className="px-4 py-2 border rounded-lg"
>
{t('common.cancel')}
</button>
<button
type="submit"
disabled={submitting}
@@ -443,4 +671,4 @@ export default function TendersPage() {
<TendersContent />
</ProtectedRoute>
)
}
}

3
frontend/src/components/contacts/ContactForm.tsx
View File

@@ -33,7 +33,7 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
commercialRegister: contact?.commercialRegister,
address: contact?.address,
city: contact?.city,
country: contact?.country || 'Saudi Arabia',
country: contact?.country || 'Syria',
postalCode: contact?.postalCode,
source: contact?.source || 'WEBSITE',
categories: contact?.categories?.map((c: any) => c.id || c) || [],
@@ -176,6 +176,7 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
<option value="HOLDING">Holding - مجموعة</option>
<option value="GOVERNMENT">Government - حكومي</option>
<option value="ORGANIZATION">Organizations - منظمات</option>
<option value="EMBASSIES">Embassies - سفارات</option>
<option value="BANK">Banks - بنوك</option>
<option value="UNIVERSITY">Universities - جامعات</option>
<option value="SCHOOL">Schools - مدارس</option>

25
frontend/src/lib/api/tenders.ts
View File

@@ -5,8 +5,18 @@ export interface Tender {
tenderNumber: string
issuingBodyName: string
title: string
termsValue: number
bondValue: number
// extra fields stored inside notes metadata for now
initialBondValue?: number | null
finalBondValue?: number | null
finalBondRefundPeriod?: string | null
siteVisitRequired?: boolean
siteVisitLocation?: string | null
termsPickupProvince?: string | null
announcementDate: string
closingDate: string
announcementLink?: string
@@ -26,6 +36,7 @@ export interface Tender {
_count?: { directives: number }
}
export interface TenderDirective {
id: string
tenderId: string
@@ -48,8 +59,18 @@ export interface CreateTenderData {
tenderNumber: string
issuingBodyName: string
title: string
termsValue: number
bondValue: number
// extra UI/backend fields without DB migration
initialBondValue?: number
finalBondValue?: number
finalBondRefundPeriod?: string
siteVisitRequired?: boolean
siteVisitLocation?: string
termsPickupProvince?: string
announcementDate: string
closingDate: string
announcementLink?: string
@@ -166,6 +187,10 @@ export const tendersAPI = {
return response.data.data
},
deleteAttachment: async (attachmentId: string): Promise<void> => {
await api.delete(`/tenders/attachments/${attachmentId}`)
},
getSourceValues: async (): Promise<string[]> => {
const response = await api.get('/tenders/source-values')
return response.data.data