))}
diff --git a/resources/js/pages/investor-path/show.tsx b/resources/js/pages/investor-path/show.tsx
index 49f889ad..dc40d94c 100644
--- a/resources/js/pages/investor-path/show.tsx
+++ b/resources/js/pages/investor-path/show.tsx
@@ -171,10 +171,8 @@ function Stage({ step, path }: { step: Step; path: Path }) {
];
const states = path.canWrite ? ownerStates : reviewStates;
return (
-
-
- {step.code} · {step.title}
-
+
+ {step.title} · {pathStates[step.state]}
{pathStates[step.state]}
{step.context_review_required && (
{step.preparation_allowed && (path.canWrite || path.canReview) && (
@@ -405,7 +404,7 @@ function Stage({ step, path }: { step: Step; path: Path }) {
)}
-
+
);
}
@@ -718,10 +717,10 @@ export default function InvestmentPath(path: Path) {
)}
{Object.entries(path.phases).filter(([number]) => path.steps.some((step) => step.phase === Number(number) && step.preparation_allowed)).map(([number, label]) => (
-
-
+ step.phase===Number(number)&&step.code===path.next?.code)} className="space-y-3 rounded border p-4" key={number}>
+
Fase {number} · {label}
-
+
{path.steps
.filter((step) => step.phase === Number(number) && step.preparation_allowed)
@@ -733,7 +732,7 @@ export default function InvestmentPath(path: Path) {
/>
))}
-
+
))}
@@ -819,10 +818,10 @@ export default function InvestmentPath(path: Path) {
Anexar ou conferir no Balcão
-
-
+
+
Acompanhamento interno
-
+
{path.canWrite && (
+
);
}
diff --git a/resources/js/pages/management/opportunity-draft.tsx b/resources/js/pages/management/opportunity-draft.tsx
index 7706f330..2c70305d 100644
--- a/resources/js/pages/management/opportunity-draft.tsx
+++ b/resources/js/pages/management/opportunity-draft.tsx
@@ -141,6 +141,7 @@ export default function OpportunityDraft({
canEditDraft?: boolean;
}>().props;
const proactiveEntryUrl=usePage().url;
+ const uniquePromoterContext=profileAccess?.contexts.length===1?profileAccess.contexts[0]:undefined;
const [data, setData] = useState({
...values,
...(!record && !values.proactive && new URLSearchParams(proactiveEntryUrl.split('?')[1]??'').get('analysis')==='proactive' ? {proactive:newProactive()} : {}),
@@ -150,10 +151,10 @@ export default function OpportunityDraft({
? (profileOrganization ?? null)
: profileAccess?.internalPromoter
? null
- : (profileAccess?.contexts[0]?.organization_id ?? null),
+ : (uniquePromoterContext?.organization_id ?? null),
opportunity_category:
values.opportunity_category ??
- profileAccess?.contexts[0]?.type ??
+ uniquePromoterContext?.type ??
'',
}
: {}),
@@ -173,10 +174,11 @@ export default function OpportunityDraft({
const unavailable = Boolean(
record?.deleted_at || record?.status === 'archived',
);
+ const hasCanonicalPreparation = profileMode && canonicalOptions && Boolean(data.opportunity_category) && !data.proactive;
const archiveAvailable = Boolean(usePage().props.opportunityManagement);
const set = (key: string, value: string) =>
setData((d) => ({ ...d, [key]: value }));
- async function send(action: 'save' | 'delete' | 'archive' | 'restore') {
+ async function send(action: 'save' | 'delete' | 'archive' | 'restore', resourcesGroup?: string) {
if (busy) return;
setBusy(true);
setErrors({});
@@ -224,8 +226,10 @@ export default function OpportunityDraft({
}
setMessage(result.message);
if (result.etag) setToken(result.etag);
- if (!record) router.visit(`${basePath}/${result.id}/edit`);
+ if (resourcesGroup) router.visit(`${basePath}/${record?.id ?? result.id}/resources?return_group=${encodeURIComponent(resourcesGroup)}`);
+ else if (!record) router.visit(`${basePath}/${result.id}/edit${window.location.hash.startsWith('#fill-') ? window.location.hash : ''}`);
else if (action !== 'save') router.reload();
+ else if (profileMode) router.reload({only:['canonicalResponse','etag','history','workflowState','profileContext']});
} catch {
setMessage(
'Resposta indisponível. Os dados foram preservados; confira o registo no servidor antes de repetir.',
@@ -237,10 +241,8 @@ export default function OpportunityDraft({
document.querySelector(
'[data-association-index][aria-invalid="true"]',
);
- (
- invalidAssociation ??
- document.getElementById('opportunity-result')
- )?.focus();
+ if (invalidAssociation) invalidAssociation.focus();
+ else document.getElementById('opportunity-result')?.focus({preventScroll:true});
});
}
}
@@ -252,9 +254,7 @@ export default function OpportunityDraft({
: 'Nova oportunidade'
}
>
-
- {profileMode ? 'Minhas oportunidades' : 'Voltar à gestão'}
-
+ {!profileMode && Voltar à gestão}
{promotionHref && Divulgação promocional — Em preparação}
{!!profileContext?.corridor_agribusiness && (
@@ -273,11 +273,11 @@ export default function OpportunityDraft({
)}
{profileMode && (
-
- Âmbito desta entrega
+ Modalidades disponíveis e condições de submissão
Seis categorias base: projeto de investimento,
imobiliário, fundiário, venda de negócio, parceria e
@@ -306,7 +306,7 @@ export default function OpportunityDraft({
certifica a viabilidade, a titularidade ou a decisão
externa de cada caso.
-
+
)}
{profileMode && record && (
@@ -834,8 +834,8 @@ export default function OpportunityDraft({
minLength={20}
maxLength={1000}
/>
-
- {!unavailable && (
+ }
+ {!unavailable && !hasCanonicalPreparation && (
@@ -893,7 +893,7 @@ export default function OpportunityDraft({
)}
- {record && (
+ {record && (!profileMode || readOnly || unavailable || !canonicalOptions || !data.opportunity_category) && (
)}
- {profileMode && canonicalOptions && (
+ {profileMode && canonicalOptions && Boolean(data.opportunity_category) && (
{record && !readOnly && !unavailable && (
- Acrescentar um contacto à oportunidade void send('save',group) : undefined}
/>
- {!readOnly && !unavailable && (
+ {!readOnly && !unavailable && hasCanonicalPreparation && (
+
+
+
- {step.code} · {step.title} -
+
+
{step.preparation_allowed && (path.canWrite || path.canReview) && (
{step.title} · {pathStates[step.state]}
{pathStates[step.state]}
{step.context_review_required && (@@ -405,7 +404,7 @@ function Stage({ step, path }: { step: Step; path: Path }) {
+ step.phase===Number(number)&&step.code===path.next?.code)} className="space-y-3 rounded border p-4" key={number}>
+
Fase {number} · {label}
-
+
Fase {number} · {label} -
{path.steps
.filter((step) => step.phase === Number(number) && step.preparation_allowed)
@@ -733,7 +732,7 @@ export default function InvestmentPath(path: Path) {
/>
))}
- @@ -819,10 +818,10 @@ export default function InvestmentPath(path: Path) { Anexar ou conferir no Balcão
+
+
Acompanhamento interno
-
+
{path.canWrite && (
Acompanhamento interno -
Âmbito desta entrega
+Seis categorias base: projeto de investimento, imobiliário, fundiário, venda de negócio, parceria e @@ -306,7 +306,7 @@ export default function OpportunityDraft({ certifica a viabilidade, a titularidade ou a decisão externa de cada caso.
-
+
+