Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: bid acceptance motivation #5

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+86 −68
Open

Feat: bid acceptance motivation #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
458762e
Add acceptance offer motivation modal
luciadabezies Jul 4, 2024
4ba92ac
Send notifications to everyone who bid
luciadabezies Jul 4, 2024
ba1bc7f
Format fix
luciadabezies Jul 5, 2024
2a08a56
fix: use offer.id instead of list index as key
sonebo Aug 13, 2024
f41835d
feat: make useOffers hook return all offers if no supplier or buyer s…
sonebo Aug 14, 2024
7a5a08e
feat: show the acceptance reason in rejected offers
sonebo Aug 14, 2024
dff3864
Merge branch 'main' into feat/bid-acceptance-motivation
sonebo Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 76 additions & 57 deletions src/components/TenderRequest.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const TenderRequest = ({

const [showModal, setShowModal] = useState(false)
const [acceptanceMotivationText, setAcceptanceMotivationText] = useState("");

const [selectedOffer, setSelectedOffer] = useState<Offer | undefined>(undefined)

useEffect(() => {
if (route.params.tenderRequestId) {
Expand All @@ -68,9 +68,7 @@ const TenderRequest = ({
}, [route.params.tenderRequestId, tenderRequests])

useEffect(() => {
const buyer = user?.type === 'buyer' ? user : undefined
const supplier = user?.type === 'supplier' ? user : undefined
refreshOffers({ buyer, supplier })
refreshOffers()
refreshTenderRequests()
}, [user])

Expand All @@ -81,11 +79,15 @@ const TenderRequest = ({
</Text>
)

const validOffers = offers

const buyer = user?.type === 'buyer' ? user : undefined
const supplier = user?.type === 'supplier' ? user : undefined

const myValidOffers = offers
.filter((offer) => offer.tenderRequestId === tenderRequest?.id)
.filter(
(offer) => offer.buyer.id === user?.id || offer.supplier.id === user?.id
)
).filter(buyer ? (offer) => offer.buyer.id === buyer.id : (offer) => offer.supplier.id === supplier?.id)
.sort((a, b) => a.price.SEK - b.price.SEK)

return (
Expand All @@ -102,10 +104,10 @@ const TenderRequest = ({
style={{ backgroundColor: '#D8F5E3' }}
// dark={false} // works the same as AppBar in react-native-paper
theme={theme} // works the same as AppBar in react-native-paper
// mode="scrollable" // fixed, scrollable | default=fixed
// onChangeIndex={(newIndex) => {}} // react on index change
// showLeadingSpace={true} // (default=true) show leading space in scrollable tabs inside the header
// disableSwipe={false} // (default=false) disable swipe to left/right gestures
// mode="scrollable" // fixed, scrollable | default=fixed
// onChangeIndex={(newIndex) => {}} // react on index change
// showLeadingSpace={true} // (default=true) show leading space in scrollable tabs inside the header
// disableSwipe={false} // (default=false) disable swipe to left/right gestures
>
<TabScreen label="Förfrågan">
<ScrollView>
Expand Down Expand Up @@ -194,7 +196,7 @@ const TenderRequest = ({
<>
{user?.type === 'supplier' && (
<Container>
{!validOffers.length && (
{!myValidOffers.length && (
<>
<Paragraph>
För att lämna anbud måste du vara ansluten till detta
Expand All @@ -218,40 +220,45 @@ const TenderRequest = ({
)}
<List.Section>
<List.Subheader>Dina skickade anbud</List.Subheader>
{validOffers.map((offer, i) => (
<Card
key={i}
style={styles.card}
onPress={() => {
console.log('pressed', offer)
navigation.navigate('Supplier', {
supplier: offer.supplier,
})
}}
>
<Card.Title
titleVariant="titleSmall"
titleStyle={{
fontSize: 14,
{myValidOffers.map((offer) => {
const winningOffer = offers.find((offer) => offer.tenderRequestId === tenderRequest.id && offer.approved)
return (
<Card
key={offer.id}
style={styles.card}
onPress={() => {
console.log('pressed', offer)
navigation.navigate('Supplier', {
supplier: offer.supplier,
})
}}
left={(props) => (
<MaterialCommunityIcons
name="file-document-outline"
color="black"
size={24}
/>
)}
title={offer.price.SEK + ' kr'}
subtitle={
'Inlämnad ' +
offer.submissionDate?.toString().split('T')[0] +
'. ' +
(offer.approved ? 'Vunnen' : 'Ej godkänt')
}
right={(props) => <ChevronRight />}
/>
</Card>
))}
>
<Card.Title
titleVariant="titleSmall"
titleStyle={{
fontSize: 14,
}}
left={(props) => (
<MaterialCommunityIcons
name="file-document-outline"
color="black"
size={24}
/>
)}
title={offer.price.SEK + ' kr'}
subtitle={
'Inlämnad ' +
offer.submissionDate?.toString().split('T')[0] +
'. '
}
right={(props) => <ChevronRight />}
/>
<View style={styles.acceptanceReasonTextWrapper}>
<Text style={styles.acceptanceReasonText}>{getStatusText(offer, winningOffer)}</Text>
</View>
</Card>
)
})}
</List.Section>
</Container>
)}
Expand All @@ -266,12 +273,12 @@ const TenderRequest = ({
</Container>
<Container>
<Subheading>Matchande anbud</Subheading>
{validOffers.map((offer, i) => (
{myValidOffers.map((offer) => (
<View>
<Card
key={i}
key={offer.id}
style={styles.card}
// onPress={() => navigation.navigate('TenderRequest', { id })}
// onPress={() => navigation.navigate('TenderRequest', { id })}
>
<Card.Title
titleVariant="titleSmall"
Expand All @@ -285,7 +292,7 @@ const TenderRequest = ({
}
subtitle={
'Inkom ' +
offer.submissionDate?.toString().split('T')[0]
offer.submissionDate?.toString().split('T')[0]
}
right={(props) => {
if (offer.approved)
Expand All @@ -306,7 +313,7 @@ const TenderRequest = ({
marginTop: 5,
}}
>
Tilldelad
Tilldelad
</Text>
</Container>
)
Expand All @@ -321,6 +328,7 @@ const TenderRequest = ({
uppercase={false}
style={{ marginRight: 10 }}
onPress={() => {
setSelectedOffer(offer)
setShowModal(true)
}}
>
Expand All @@ -331,31 +339,33 @@ const TenderRequest = ({
/>
{offer.acceptanceMotivation && (
<View style={styles.acceptanceReasonTextWrapper}>
<Text style={styles.acceptanceReasonText}>Acceptance reason: {offer.acceptanceMotivation}</Text>
<Text style={styles.acceptanceReasonText}>Motivering till val av anbud:</Text>
<Text style={styles.acceptanceReasonText}>{offer.acceptanceMotivation}</Text>
</View>
)}
</Card>
<Modal visible={showModal} transparent={true}>
<View style={styles.centerView}>
<View style={styles.modalView}>
<Text style={styles.modalText}>
Motivation to choose {offer.buyer.name}'s offer:{' '}
Motivering till valet av {selectedOffer?.supplier.name}s anbud:{' '}
</Text>
<TextInput
style={styles.modalInput}
multiline={true}
onChangeText={text => setAcceptanceMotivationText(text)}
/>
<Container style={styles.modalButtons}>
<Button onPress={() => setShowModal(false)}>
Cancel
<Button onPress={() => {
setShowModal(false)
setSelectedOffer(undefined)
}}>
Avbryt
</Button>
<Button
mode="contained"
onPress={() => {
console.log('offer', offer)
console.log('motivation text', acceptanceMotivationText)
updateOffer({ ...offer, acceptanceMotivation: acceptanceMotivationText, approved: true })
updateOffer({ ...selectedOffer, acceptanceMotivation: acceptanceMotivationText, approved: true })
setShowModal(false)
}}
>
Expand All @@ -364,7 +374,7 @@ const TenderRequest = ({
</Container>
</View>
</View>
</Modal>
</Modal>
</View>
))}
</Container>
Expand All @@ -389,6 +399,15 @@ const TenderRequest = ({
</>
)
}
const getStatusText = (offer: Offer, winningOffer: Offer | undefined) => {
if (winningOffer != undefined) {
if (offer.approved) {
return `Ert anbud valdes med motiveringen: ${offer.acceptanceMotivation}`
}
return `Ett annat anbud från ${winningOffer.supplier.name} valdes med motiveringen: ${winningOffer.acceptanceMotivation}`
}
return 'Ej godkänt'
}

const Row = ({ children }) => (
<View style={{ flexDirection: 'row' }}>{children}</View>
Expand Down
21 changes: 10 additions & 11 deletions src/hooks/useOffers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,16 @@ const useOffers = (): [Array<Offer>, any, any, any] => {
}

const refresh = ({ supplier, buyer } = {}) =>
socket.emit('offers', (offers: Array<Offer>) =>
setOffers(
offers
.filter((o) => {
if (supplier) return o.supplier.id == supplier.id
if (buyer) return o.buyer.id == buyer.id
return true
})
.sort((a, b) => a.price.SEK - b.price.SEK)
)
)
socket.emit('offers', (offers: Array<Offer>) => {
let filteredOffers = offers
if (supplier) {
filteredOffers = filteredOffers.filter((o) => o.supplier.id == supplier.id)
}
if (buyer) {
filteredOffers = filteredOffers.filter((o) => o.buyer.id == buyer.id)
}
setOffers(filteredOffers.sort((a, b) => a.price.SEK - b.price.SEK))
})

return [offers, editOffer, addOffer, refresh]
}
Expand Down