diff --git a/src/app/styles/violation-details.scss b/src/app/styles/violation-details.scss index d16e468..bf56b32 100644 --- a/src/app/styles/violation-details.scss +++ b/src/app/styles/violation-details.scss @@ -142,11 +142,11 @@ } .btn-primary-small { - border: 2px solid v.$status-in-work; - color: v.$status-in-work; + border: 2px solid v.$status-showed; + color: v.$status-showed; &:hover { - background: v.$status-in-work; + background: v.$status-showed; color: white; } } @@ -292,6 +292,15 @@ display: flex; justify-content: space-between; align-items: center; + + .pagination-controls-pages button, + .pagination-controls .arrow { + color: v.$text-p; + + &.current { + background-color: #e9ecef; + } + } } .source-status { @@ -823,21 +832,42 @@ } } + + .note-form-flex { + display: flex; + gap: 10px; + } + + .note-case-label { + font-weight: 600; + display: block; + background: #e9ecef; + color: v.$text-p; + padding: 5px 10px; + } + + .note-case-input, .note-textarea { - width: 100%; - min-height: 80px; - padding: 10px 20px; - border: 1px solid v.$border-color-1; - border-radius: 8px; - font-family: inherit; - resize: vertical; + background: v.$white; box-sizing: border-box; - background: #f8fafc; + padding: 10px 20px; + border-radius: 0 0 8px 8px; + + &:hover { + background: v.$bg-light; + } &:focus { outline: none; - box-shadow: 2px 2px 4px v.$shadow-1; } + } + + .note-textarea { + width: 100%; + min-height: 80px; + font-family: inherit; + resize: none; + vertical-align: top; &-wrapper { display: flex; @@ -846,43 +876,32 @@ } } - .note-form-flex { - display: flex; - gap: 10px; - margin-bottom: 10px; - } - .note-case-input { - border: 1px solid v.$border-color-1; - border-radius: 8px; - box-sizing: border-box; - background: #f8fafc; - padding: 10px 20px; &::-webkit-outer-spin-button, &::-webkit-inner-spin-button { -webkit-appearance: none; margin: 0; } - - &:focus { - outline: none; - box-shadow: 2px 2px 4px v.$shadow-1; - } - - &::placeholder { - font-size: 12px; - } - } - - .note-case-label { - font-weight: 600; } .note-form-group { + border: 1px solid #e9ecef; + box-sizing: border-box; + padding: 0px; + border-radius: 8px; + margin-bottom: 10px; + overflow: hidden; + input { display: block; } + + input[name="amount"] { + &::placeholder { + font-size: 12px; + } + } } } diff --git a/src/app/ui/file-page/violation-table/case-complaint.tsx b/src/app/ui/file-page/violation-table/case-complaint.tsx index e044ba7..0e50439 100644 --- a/src/app/ui/file-page/violation-table/case-complaint.tsx +++ b/src/app/ui/file-page/violation-table/case-complaint.tsx @@ -86,20 +86,26 @@ export default function CaseComplaint({ selectedViolation, updateStatusHandler }
- - + + + + +
diff --git a/src/app/ui/file-page/violation-table/case-legal.tsx b/src/app/ui/file-page/violation-table/case-legal.tsx index 629ed5b..92fa21a 100644 --- a/src/app/ui/file-page/violation-table/case-legal.tsx +++ b/src/app/ui/file-page/violation-table/case-legal.tsx @@ -86,8 +86,7 @@ export default function CaseViolation({ selectedViolation, updateStatusHandler } className="note-case-label" htmlFor="caseTitle" > - {/* {t('case-name')} */} - Название претензии + {t('case-name')}
+ + {state?.errorMessage?.textArea && (

Promise; @@ -14,6 +15,7 @@ const STATUSES_IN_WORK = ['COMPLAINT_IN_WORK', 'LEGAL_IN_WORK', 'COMPLAINT_AND_L type TabType = 'complaint' | 'legal' export default function FilePageViolationInfoTabs({ selectedViolation, updateStatusHandler }: { selectedViolation: ViolationFileDetail, updateStatusHandler: UpdateStatusHandler }) { + const t = useTranslations('Global'); const [activeTab, setActiveTab] = useState('complaint'); const [showTabs, setShowTabs] = useState(false); const isInWork = STATUSES_IN_WORK.includes(selectedViolation.status); @@ -61,7 +63,9 @@ export default function FilePageViolationInfoTabs({ selectedViolation, updateSta if (!isInWork && !showTabs) { return (

-

Вы можете

+

+ {t('you-can')} +

- или + {t('or')}
@@ -98,13 +102,13 @@ export default function FilePageViolationInfoTabs({ selectedViolation, updateSta className={`btn-s btn-primary ${activeTab === 'complaint' ? 'active' : ''} ${localViolation.status === 'COMPLAINT_IN_WORK' || localViolation.status === 'COMPLAINT_AND_LEGAL_IN_WORK' ? '' : 'action'}`} onClick={() => setActiveTab('complaint')} > - {localViolation.status === 'COMPLAINT_IN_WORK' || localViolation.status === 'COMPLAINT_AND_LEGAL_IN_WORK' ? 'Жалоба' : 'Подать жалобу'} + {localViolation.status === 'COMPLAINT_IN_WORK' || localViolation.status === 'COMPLAINT_AND_LEGAL_IN_WORK' ? t('complaint') : t('file-a-complaint')}
diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json index 1bae2bb..3a0aca1 100644 --- a/src/i18n/messages/en.json +++ b/src/i18n/messages/en.json @@ -409,6 +409,7 @@ "type": "Type", "lawyer": "Lawyer", "not-assigned": "Not assigned", + "case": "Case", "create-case": "Create case", "case-name": "Case name", "amount-of-damage": "Amount of damage", @@ -424,7 +425,11 @@ "under-moderation": "Under moderation", "full-link": "Full link", "follow-the-link": "Follow the link", - "date-of-discovery": "Date of discovery" + "date-of-discovery": "Date of discovery", + "file-a-claim": "File a claim", + "file-a-complaint": "File a complaint", + "you-can": "You can", + "complaint": "Complaint" }, "Login-register-form": { "and": "and", diff --git a/src/i18n/messages/ru.json b/src/i18n/messages/ru.json index 6916dd6..1cd4917 100644 --- a/src/i18n/messages/ru.json +++ b/src/i18n/messages/ru.json @@ -409,6 +409,7 @@ "type": "Тип", "lawyer": "Адвокат", "not-assigned": "Не назначено", + "case": "Претензия", "create-case": "Создать претензию", "case-name": "Название претензии", "amount-of-damage": "Сумма ущерба", @@ -424,7 +425,11 @@ "under-moderation": "На модерации", "full-link": "Полная ссылка", "follow-the-link": "Перейти", - "date-of-discovery": "Дата обнаружения" + "date-of-discovery": "Дата обнаружения", + "file-a-claim": "Подать претензию", + "file-a-complaint": "Подать жалобу", + "you-can": "Вы можете", + "complaint": "Жалоба" }, "Login-register-form": { "and": "и",