Compare commits
8 Commits
7c26288c01
..
dev
| Author | SHA1 | Date | |
|---|---|---|---|
 AmirReza Jamali
|
72881df210 | ||
|
AmirReza Jamali
|
ce170f9bc8 | ||
|
AmirReza Jamali
|
f43ca4913c | ||
|
AmirReza Jamali
|
727dadecf8 | ||
|
AmirReza Jamali
|
7b5b6b85f8 | ||
|
AmirReza Jamali
|
6cd8d7cc7f | ||
|
AmirReza Jamali
|
17ccd9d464 | ||
|
AmirReza Jamali
|
984f2e5139 |
@@ -53,3 +53,6 @@ app.*.map.json
|
||||
**/android/app/google-services.json
|
||||
**/ios/Runner/GoogleService-Info.plist
|
||||
**/lib/firebase_options.dart
|
||||
|
||||
# IDE
|
||||
.cursor
|
||||
@@ -0,0 +1,165 @@
|
||||
# Home Page API — Response Time Benchmarks
|
||||
|
||||
Measured from the client network (curl) against production.
|
||||
|
||||
| Field | Value |
|
||||
|-------|-------|
|
||||
| **Date** | 2026-07-07 |
|
||||
| **Base URL** | `https://app.opplenz.com` |
|
||||
| **Runs per endpoint** | 10 |
|
||||
| **Account** | `test@email.com` |
|
||||
| **Company ID** | `69dbef4e0917c63d28787737` |
|
||||
|
||||
All requests returned **HTTP 200** on every run.
|
||||
|
||||
---
|
||||
|
||||
## Average response time
|
||||
|
||||
| # | Endpoint | Method | Avg (ms) | Min (ms) | Max (ms) | Blocks UI? | % of blocking load |
|
||||
|---|----------|--------|----------|----------|----------|------------|-------------------|
|
||||
| 1 | `/api/v1/tender-approvals/stats` | GET | **614** | 520 | 793 | Yes | 3.4% |
|
||||
| 2 | `/api/v1/tender-approvals?limit=10&offset=0` | GET | **16,688** | 16,503 | 17,061 | Yes | **93.6%** |
|
||||
| 3 | `/api/v1/feedback?feedback_type=like&limit=1&offset=0` | GET | **554** | 506 | 668 | Yes | 3.1% |
|
||||
| 4 | `/api/v1/notifications?seen=false&limit=1&event_type=PUSH` | GET | **548** | 483 | 642 | No | — |
|
||||
| 5 | `/api/v1/tenders/recommend?limit=10&offset=0` | GET | **5,716** | 4,010 | 8,361 | No* | — |
|
||||
|
||||
\* Call #5 only fires when call #2 returns an empty tender list. It does not block the initial loading spinner, but still adds server load and may update the list shortly after render.
|
||||
|
||||
---
|
||||
|
||||
## Totals
|
||||
|
||||
| Metric | Time |
|
||||
|--------|------|
|
||||
| **Sequential blocking total** (calls 1 + 2 + 3) | **~17.9 s** |
|
||||
| **Slowest single endpoint** | `GET /api/v1/tender-approvals` — **16.7 s avg** |
|
||||
| **Fastest endpoint** | `GET /api/v1/notifications` — **0.5 s avg** |
|
||||
|
||||
The home page waits on calls 1 → 2 → 3 in series before rendering. **`/api/v1/tender-approvals` accounts for ~94% of that wait.**
|
||||
|
||||
---
|
||||
|
||||
## Raw timings (seconds)
|
||||
|
||||
### 1. Tender approval stats
|
||||
`GET /api/v1/tender-approvals/stats`
|
||||
|
||||
| Run | Time (s) |
|
||||
|-----|----------|
|
||||
| 1 | 0.779 |
|
||||
| 2 | 0.662 |
|
||||
| 3 | 0.644 |
|
||||
| 4 | 0.793 |
|
||||
| 5 | 0.597 |
|
||||
| 6 | 0.536 |
|
||||
| 7 | 0.562 |
|
||||
| 8 | 0.533 |
|
||||
| 9 | 0.520 |
|
||||
| 10 | 0.520 |
|
||||
| **Avg** | **0.614** |
|
||||
|
||||
### 2. Your tenders
|
||||
`GET /api/v1/tender-approvals?limit=10&offset=0`
|
||||
|
||||
| Run | Time (s) |
|
||||
|-----|----------|
|
||||
| 1 | 16.503 |
|
||||
| 2 | 16.573 |
|
||||
| 3 | 16.873 |
|
||||
| 4 | 16.607 |
|
||||
| 5 | 17.061 |
|
||||
| 6 | 16.600 |
|
||||
| 7 | 16.628 |
|
||||
| 8 | 16.707 |
|
||||
| 9 | 16.727 |
|
||||
| 10 | 16.606 |
|
||||
| **Avg** | **16.688** |
|
||||
|
||||
### 3. Liked tenders count
|
||||
`GET /api/v1/feedback?feedback_type=like&limit=1&offset=0`
|
||||
|
||||
| Run | Time (s) |
|
||||
|-----|----------|
|
||||
| 1 | 0.629 |
|
||||
| 2 | 0.506 |
|
||||
| 3 | 0.515 |
|
||||
| 4 | 0.594 |
|
||||
| 5 | 0.521 |
|
||||
| 6 | 0.509 |
|
||||
| 7 | 0.529 |
|
||||
| 8 | 0.529 |
|
||||
| 9 | 0.542 |
|
||||
| 10 | 0.668 |
|
||||
| **Avg** | **0.554** |
|
||||
|
||||
### 4. Unread notifications (background)
|
||||
`GET /api/v1/notifications?seen=false&limit=1&event_type=PUSH`
|
||||
|
||||
| Run | Time (s) |
|
||||
|-----|----------|
|
||||
| 1 | 0.566 |
|
||||
| 2 | 0.540 |
|
||||
| 3 | 0.486 |
|
||||
| 4 | 0.607 |
|
||||
| 5 | 0.541 |
|
||||
| 6 | 0.498 |
|
||||
| 7 | 0.614 |
|
||||
| 8 | 0.642 |
|
||||
| 9 | 0.506 |
|
||||
| 10 | 0.483 |
|
||||
| **Avg** | **0.548** |
|
||||
|
||||
### 5. Recommended tenders (conditional)
|
||||
`GET /api/v1/tenders/recommend?limit=10&offset=0`
|
||||
|
||||
| Run | Time (s) |
|
||||
|-----|----------|
|
||||
| 1 | 4.364 |
|
||||
| 2 | 5.880 |
|
||||
| 3 | 5.402 |
|
||||
| 4 | 4.010 |
|
||||
| 5 | 6.512 |
|
||||
| 6 | 5.827 |
|
||||
| 7 | 5.584 |
|
||||
| 8 | 5.653 |
|
||||
| 9 | 8.361 |
|
||||
| 10 | 5.575 |
|
||||
| **Avg** | **5.716** |
|
||||
|
||||
---
|
||||
|
||||
## Key finding
|
||||
|
||||
| Priority | Endpoint | Issue |
|
||||
|----------|----------|-------|
|
||||
| **P0** | `GET /api/v1/tender-approvals?limit=10&offset=0` | ~17 s average — dominates home page load |
|
||||
| P1 | `GET /api/v1/tenders/recommend?limit=10&offset=0` | ~5.7 s average — slow when used as fallback |
|
||||
| P2 | `GET /api/v1/tender-approvals/stats` | ~0.6 s — acceptable but called on every home visit |
|
||||
| — | Feedback + notifications | ~0.55 s each — not a bottleneck |
|
||||
|
||||
---
|
||||
|
||||
## How to reproduce
|
||||
|
||||
```bash
|
||||
TOKEN='<access_token>'
|
||||
BASE='https://app.opplenz.com'
|
||||
|
||||
for url in \
|
||||
"$BASE/api/v1/tender-approvals/stats" \
|
||||
"$BASE/api/v1/tender-approvals?limit=10&offset=0" \
|
||||
"$BASE/api/v1/feedback?feedback_type=like&limit=1&offset=0" \
|
||||
"$BASE/api/v1/notifications?seen=false&limit=1&event_type=PUSH" \
|
||||
"$BASE/api/v1/tenders/recommend?limit=10&offset=0"
|
||||
do
|
||||
curl -s -o /dev/null -w "%{time_total}s %{http_code} $url\n" \
|
||||
-H "Authorization: Bearer $TOKEN" "$url"
|
||||
done
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Related
|
||||
|
||||
See [home-page-api-calls.md](./home-page-api-calls.md) for full call order, parameters, and optimization suggestions.
|
||||
@@ -0,0 +1,280 @@
|
||||
# Home Page API Calls
|
||||
|
||||
Document for the backend team. Describes every HTTP request the mobile/web client fires when the user opens `/home`, including call order, parameters, and what blocks the UI from rendering.
|
||||
|
||||
**Context:** Home page load feels slow. The client currently waits on **3 sequential API calls** before showing content. A 4th call runs in the background; a 5th may fire when the user has no "your tenders".
|
||||
|
||||
**Base URL:** `https://app.opplenz.com`
|
||||
**Auth:** All requests include `Authorization: Bearer <access_token>`.
|
||||
|
||||
---
|
||||
|
||||
## Summary
|
||||
|
||||
| # | Endpoint | Method | Blocking UI? | When |
|
||||
|---|----------|--------|--------------|------|
|
||||
| 1 | `/api/v1/tender-approvals/stats` | GET | **Yes** | Always on home load |
|
||||
| 2 | `/api/v1/tender-approvals?limit=10&offset=0` | GET | **Yes** | Always on home load |
|
||||
| 3 | `/api/v1/feedback?feedback_type=like&limit=1&offset=0` | GET | **Yes** | Always on home load |
|
||||
| 4 | `/api/v1/notifications?seen=false&limit=1&event_type=PUSH` | GET | No (background) | App shell mount (parallel) |
|
||||
| 5 | `/api/v1/tenders/recommend?limit=10&offset=0` | GET | No | Only when call #2 returns an empty tender list |
|
||||
|
||||
**Minimum calls on first load:** 4 (calls 1–3 + 4)
|
||||
**Maximum calls on first load:** 5 (adds call 5 when user has no your-tenders)
|
||||
|
||||
**Perceived load time (client-side):** Sum of response times for calls 1 → 2 → 3 (sequential `await` chain).
|
||||
|
||||
---
|
||||
|
||||
## Call sequence
|
||||
|
||||
```
|
||||
User opens /home
|
||||
│
|
||||
├─ [parallel, background] App shell
|
||||
│ └─ GET /api/v1/notifications?seen=false&limit=1&event_type=PUSH
|
||||
│
|
||||
└─ [blocking] HomeViewModel.init()
|
||||
│
|
||||
├─ 1. GET /api/v1/tender-approvals/stats ← await
|
||||
├─ 2. GET /api/v1/tender-approvals?limit=10&offset=0 ← await
|
||||
│ └─ if tenders[] is empty (fire-and-forget, not awaited):
|
||||
│ GET /api/v1/tenders/recommend?limit=10&offset=0
|
||||
└─ 3. GET /api/v1/feedback?feedback_type=like&limit=1&offset=0 ← await
|
||||
└─ UI renders (_isLoading = false)
|
||||
```
|
||||
|
||||
Source: `lib/view_models/home_view_model.dart` → `init()`
|
||||
|
||||
---
|
||||
|
||||
## API details
|
||||
|
||||
### 1. Tender approval stats
|
||||
|
||||
Partnership / self-apply progress rings on the home dashboard.
|
||||
|
||||
| Field | Value |
|
||||
|-------|-------|
|
||||
| **Method** | `GET` |
|
||||
| **Path** | `/api/v1/tender-approvals/stats` |
|
||||
| **Query params** | None |
|
||||
| **Blocking** | Yes — first call in `init()` |
|
||||
| **Response fields used** | `data.partnership_count`, `data.self_apply_count` |
|
||||
|
||||
**Example:**
|
||||
```http
|
||||
GET /api/v1/tender-approvals/stats
|
||||
Authorization: Bearer <token>
|
||||
Accept: application/json
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 2. Your tenders (horizontal list)
|
||||
|
||||
Main tender carousel and "Your Tenders" section.
|
||||
|
||||
| Field | Value |
|
||||
|-------|-------|
|
||||
| **Method** | `GET` |
|
||||
| **Path** | `/api/v1/tender-approvals` |
|
||||
| **Query params** | `limit=10`, `offset=0` |
|
||||
| **Optional filters** | Not sent from home (`status`, `created_from`, `created_to` are empty) |
|
||||
| **Blocking** | Yes — second call in `init()` |
|
||||
| **Response fields used** | `data.tenders[].tender` (full tender objects), `data.metadata.pages` (pagination) |
|
||||
|
||||
**Example:**
|
||||
```http
|
||||
GET /api/v1/tender-approvals?limit=10&offset=0
|
||||
Authorization: Bearer <token>
|
||||
Accept: application/json
|
||||
```
|
||||
|
||||
**Note:** This is likely the heaviest call — it returns up to 10 full tender objects with nested data.
|
||||
|
||||
---
|
||||
|
||||
### 3. Liked tenders count
|
||||
|
||||
"Liked Tenders" stat card count.
|
||||
|
||||
| Field | Value |
|
||||
|-------|-------|
|
||||
| **Method** | `GET` |
|
||||
| **Path** | `/api/v1/feedback` |
|
||||
| **Query params** | `feedback_type=like`, `limit=1`, `offset=0` |
|
||||
| **Blocking** | Yes — third call in `init()` |
|
||||
| **Response fields used** | `data.meta.total` only (client ignores the single returned item) |
|
||||
|
||||
**Example:**
|
||||
```http
|
||||
GET /api/v1/feedback?feedback_type=like&limit=1&offset=0
|
||||
Authorization: Bearer <token>
|
||||
Accept: application/json
|
||||
```
|
||||
|
||||
**Optimization opportunity:** Client only needs a count. A dedicated count endpoint (or `meta.total` without loading feedback records) would be faster than a full feedback query.
|
||||
|
||||
---
|
||||
|
||||
### 4. Unread notification check (background)
|
||||
|
||||
Red dot on the notification tab icon.
|
||||
|
||||
| Field | Value |
|
||||
|-------|-------|
|
||||
| **Method** | `GET` |
|
||||
| **Path** | `/api/v1/notifications` |
|
||||
| **Query params** | `seen=false`, `limit=1`, `event_type=PUSH` |
|
||||
| **Blocking** | No — fired from app shell `postFrameCallback` |
|
||||
| **Response fields used** | Presence of any result (updates `NotificationStateService`) |
|
||||
|
||||
**Example:**
|
||||
```http
|
||||
GET /api/v1/notifications?seen=false&limit=1&event_type=PUSH
|
||||
Authorization: Bearer <token>
|
||||
Accept: application/json
|
||||
```
|
||||
|
||||
Source: `lib/core/routes/app_shell/app_shell_screen.dart`
|
||||
|
||||
---
|
||||
|
||||
### 5. Recommended tenders (conditional fallback)
|
||||
|
||||
Shown when the user has no "your tenders". Replaces the horizontal list label with "Recommended Tenders".
|
||||
|
||||
| Field | Value |
|
||||
|-------|-------|
|
||||
| **Method** | `GET` |
|
||||
| **Path** | `/api/v1/tenders/recommend` |
|
||||
| **Query params** | `limit=10`, `offset=0` |
|
||||
| **Blocking** | No — triggered inside `getYourTenders()` without `await` |
|
||||
| **Condition** | Fires only when call #2 returns `data.tenders` empty |
|
||||
| **Response fields used** | `data.tenders[]` (full tender objects) |
|
||||
|
||||
**Example:**
|
||||
```http
|
||||
GET /api/v1/tenders/recommend?limit=10&offset=0
|
||||
Authorization: Bearer <token>
|
||||
Accept: application/json
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Pagination (scroll, not initial load)
|
||||
|
||||
After the home page renders, scrolling the horizontal tender list near the end triggers additional calls:
|
||||
|
||||
| Mode | Endpoint | Params |
|
||||
|------|----------|--------|
|
||||
| Your tenders | `GET /api/v1/tender-approvals` | `limit=10`, `offset=<page * 10>` |
|
||||
| Recommended (fallback mode) | `GET /api/v1/tenders/recommend` | `limit=10`, `offset=<page * 10>` |
|
||||
|
||||
Page size is always **10**.
|
||||
|
||||
---
|
||||
|
||||
## Re-fetch triggers
|
||||
|
||||
The full `init()` sequence (calls 1–3, and possibly 5) runs again when:
|
||||
|
||||
- User switches away from Home tab and returns to it
|
||||
- User navigates to Liked Tenders and comes back (`homeViewModel.init()` on return)
|
||||
|
||||
This means the same 3–5 API calls can repeat on every tab switch back to Home.
|
||||
|
||||
---
|
||||
|
||||
## APIs defined but NOT called on home load
|
||||
|
||||
| Endpoint | Notes |
|
||||
|----------|-------|
|
||||
| `GET /api/v1/feedback/stats/company` | Defined in client (`HomeApi.statsCompany`) but never called from home |
|
||||
|
||||
Some home stat cards show hardcoded `0` values (approved tenders count, tender value) — no API backing today.
|
||||
|
||||
---
|
||||
|
||||
## Performance notes for backend
|
||||
|
||||
### Client-side bottleneck
|
||||
|
||||
The client **does not parallelize** calls 1, 2, and 3. Total time-to-interactive ≈ `T(stats) + T(your-tenders) + T(liked-count)`.
|
||||
|
||||
### Suggested backend investigations
|
||||
|
||||
1. **`GET /api/v1/tender-approvals?limit=10&offset=0`** — Likely the slowest call. Check query plans, N+1 joins, and payload size (10 full tender objects).
|
||||
2. **`GET /api/v1/tender-approvals/stats`** — Runs before every home load; consider caching per company/user.
|
||||
3. **`GET /api/v1/feedback?feedback_type=like&limit=1&offset=0`** — Client only reads `meta.total`. A lightweight `GET /api/v1/feedback/count?feedback_type=like` would avoid loading feedback rows.
|
||||
4. **`GET /api/v1/tenders/recommend`** — May involve recommendation/AI logic; profile separately from tender-approvals.
|
||||
|
||||
### Suggested backend optimizations
|
||||
|
||||
| Idea | Benefit |
|
||||
|------|---------|
|
||||
| Single aggregated `GET /api/v1/home` endpoint | One round-trip instead of 3 sequential |
|
||||
| Return stats + liked count alongside tender-approvals list | Eliminate calls 1 and 3 |
|
||||
| Slim tender DTO for list views (id, title, deadline, status only) | Smaller payloads on call #2 and #5 |
|
||||
| Cache stats and liked count with short TTL | Faster repeat visits / tab switches |
|
||||
|
||||
### Suggested client optimizations (for reference)
|
||||
|
||||
These are frontend changes the mobile team could make independently:
|
||||
|
||||
- Run calls 1, 2, and 3 in parallel (`Future.wait`)
|
||||
- Do not re-run full `init()` on every tab switch — refresh only stale data
|
||||
- Await the recommend fallback before clearing loading state (avoids UI flicker)
|
||||
|
||||
---
|
||||
|
||||
## Source files (client)
|
||||
|
||||
| File | Role |
|
||||
|------|------|
|
||||
| `lib/view_models/home_view_model.dart` | Orchestrates all home API calls |
|
||||
| `lib/data/repositories/home_repository.dart` | Repository layer |
|
||||
| `lib/data/services/home_service.dart` | Stats, recommend, notifications |
|
||||
| `lib/data/services/your_tenders_service.dart` | Your tenders list |
|
||||
| `lib/data/services/liked_tenders_service.dart` | Liked count |
|
||||
| `lib/data/services/api/home_api.dart` | Endpoint path constants |
|
||||
| `lib/data/services/api/your_tenders_api.dart` | Tender-approvals URL builder |
|
||||
| `lib/data/services/api/liked_tenders_api.dart` | Feedback URL builder |
|
||||
| `lib/core/routes/app_shell/app_shell_screen.dart` | Background notification check |
|
||||
| `lib/views/home/pages/home_screen.dart` | Re-init on tab return |
|
||||
|
||||
---
|
||||
|
||||
## Quick test commands
|
||||
|
||||
Replace `$TOKEN` with a valid access token.
|
||||
|
||||
```bash
|
||||
# 1. Stats
|
||||
curl -s -w "\n%{http_code} %{time_total}s\n" \
|
||||
'https://app.opplenz.com/api/v1/tender-approvals/stats' \
|
||||
-H "Authorization: Bearer $TOKEN" | tail -1
|
||||
|
||||
# 2. Your tenders
|
||||
curl -s -w "\n%{http_code} %{time_total}s\n" \
|
||||
'https://app.opplenz.com/api/v1/tender-approvals?limit=10&offset=0' \
|
||||
-H "Authorization: Bearer $TOKEN" | tail -1
|
||||
|
||||
# 3. Liked count
|
||||
curl -s -w "\n%{http_code} %{time_total}s\n" \
|
||||
'https://app.opplenz.com/api/v1/feedback?feedback_type=like&limit=1&offset=0' \
|
||||
-H "Authorization: Bearer $TOKEN" | tail -1
|
||||
|
||||
# 4. Notifications (background)
|
||||
curl -s -w "\n%{http_code} %{time_total}s\n" \
|
||||
'https://app.opplenz.com/api/v1/notifications?seen=false&limit=1&event_type=PUSH' \
|
||||
-H "Authorization: Bearer $TOKEN" | tail -1
|
||||
|
||||
# 5. Recommended (only when your tenders empty)
|
||||
curl -s -w "\n%{http_code} %{time_total}s\n" \
|
||||
'https://app.opplenz.com/api/v1/tenders/recommend?limit=10&offset=0' \
|
||||
-H "Authorization: Bearer $TOKEN" | tail -1
|
||||
```
|
||||
|
||||
Run all five and compare `time_total` to identify the slowest endpoint.
|
||||
@@ -18,6 +18,7 @@ import 'package:tm_app/data/services/company_ai_service.dart';
|
||||
import 'package:tm_app/data/services/notification_state_service.dart';
|
||||
import 'package:tm_app/data/services/tender_detail_service.dart';
|
||||
import 'package:tm_app/data/services/your_tenders_service.dart';
|
||||
import 'package:tm_app/data/services/tender_submissions_service.dart';
|
||||
import 'package:tm_app/view_models/final_completion_of_documents_view_model.dart';
|
||||
|
||||
import '../../data/repositories/auth_repository.dart';
|
||||
@@ -81,6 +82,11 @@ List<SingleChildWidget> get apiClients {
|
||||
create: (context) => YourTendersService(networkManager: context.read()),
|
||||
lazy: true,
|
||||
),
|
||||
Provider(
|
||||
create:
|
||||
(context) => TenderSubmissionsService(networkManager: context.read()),
|
||||
lazy: true,
|
||||
),
|
||||
Provider(
|
||||
create: (context) => LikedTendersService(networkManager: context.read()),
|
||||
lazy: true,
|
||||
@@ -119,6 +125,7 @@ List<SingleChildWidget> get repositories {
|
||||
(context) => YourTendersRepository(
|
||||
yourTendersService: context.read(),
|
||||
likedTendersService: context.read(),
|
||||
tenderSubmissionsService: context.read(),
|
||||
),
|
||||
lazy: true,
|
||||
),
|
||||
@@ -128,6 +135,7 @@ List<SingleChildWidget> get repositories {
|
||||
homeService: context.read(),
|
||||
yourTendersService: context.read(),
|
||||
likedTendersService: context.read(),
|
||||
tenderSubmissionsService: context.read(),
|
||||
),
|
||||
lazy: true,
|
||||
),
|
||||
|
||||
@@ -179,7 +179,16 @@ class NetworkManager {
|
||||
/// Handle HTTP error responses
|
||||
Result<T> _handleHttpError<T>(Response response) {
|
||||
final statusCode = response.statusCode;
|
||||
final message = _extractErrorMessage(response.data);
|
||||
var message = _extractErrorMessage(response.data);
|
||||
if (statusCode == 422 && response.data is Map<String, dynamic>) {
|
||||
final envelope = response.data as Map<String, dynamic>;
|
||||
final error = envelope['error'];
|
||||
if (error is Map<String, dynamic> &&
|
||||
error['details'] is String &&
|
||||
(error['details'] as String).isNotEmpty) {
|
||||
message = error['details'] as String;
|
||||
}
|
||||
}
|
||||
|
||||
switch (statusCode) {
|
||||
case 400:
|
||||
@@ -238,16 +247,10 @@ class NetworkManager {
|
||||
);
|
||||
|
||||
case DioExceptionType.badResponse:
|
||||
if (e.response?.statusCode == 401) {
|
||||
// Handle token refresh logic here if needed
|
||||
// For now, return authentication error
|
||||
return Result.error(
|
||||
AuthenticationException(
|
||||
'Authentication failed',
|
||||
e.response?.statusCode,
|
||||
e,
|
||||
),
|
||||
);
|
||||
if (e.response != null) {
|
||||
// Preserve the backend envelope (including validation details) for
|
||||
// non-2xx responses such as 409 and 422.
|
||||
return _handleHttpError(e.response!);
|
||||
}
|
||||
return Result.error(
|
||||
FetchDataException(
|
||||
|
||||
@@ -200,7 +200,9 @@ class TendersRouteData extends GoRouteData with _$TendersRouteData {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, GoRouterState state) {
|
||||
return tendersProvider(child: const TendersScreen());
|
||||
return tendersProvider(
|
||||
child: TendersScreen(initialTab: state.uri.queryParameters['tab']),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,12 @@ class AppToast {
|
||||
context: context,
|
||||
type: ToastificationType.success,
|
||||
style: ToastificationStyle.flatColored,
|
||||
title: Text(message),
|
||||
title: Text(
|
||||
message,
|
||||
maxLines: 5,
|
||||
softWrap: true,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
autoCloseDuration: const Duration(seconds: 3),
|
||||
);
|
||||
}
|
||||
@@ -17,7 +22,12 @@ class AppToast {
|
||||
context: context,
|
||||
type: ToastificationType.error,
|
||||
style: ToastificationStyle.flatColored,
|
||||
title: Text(message),
|
||||
title: Text(
|
||||
message,
|
||||
maxLines: 5,
|
||||
softWrap: true,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
autoCloseDuration: const Duration(seconds: 3),
|
||||
);
|
||||
}
|
||||
@@ -31,8 +41,18 @@ class AppToast {
|
||||
context: context,
|
||||
type: ToastificationType.info,
|
||||
style: ToastificationStyle.flatColored,
|
||||
title: Text(title),
|
||||
description: Text(description),
|
||||
title: Text(
|
||||
title,
|
||||
maxLines: 2,
|
||||
softWrap: true,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
description: Text(
|
||||
description,
|
||||
maxLines: 5,
|
||||
softWrap: true,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
autoCloseDuration: const Duration(seconds: 6),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -4,6 +4,9 @@ import 'package:tm_app/data/services/liked_tenders_service.dart';
|
||||
import 'package:tm_app/data/services/model/recommended_tenders_response/recommended_tenders_response.dart';
|
||||
import 'package:tm_app/data/services/model/tender_approvals_response/tender_approvals_response.dart';
|
||||
import 'package:tm_app/data/services/model/tender_approvals_stats_response/tender_approvals_stats_response.dart';
|
||||
import 'package:tm_app/data/services/model/feedback_stats_response/feedback_stat_response.dart';
|
||||
import 'package:tm_app/data/services/model/tender_submission/tender_submission.dart';
|
||||
import 'package:tm_app/data/services/tender_submissions_service.dart';
|
||||
|
||||
import '../services/model/request_models/get_tenders_request_model/get_tenders_request_model.dart';
|
||||
import '../services/model/request_models/tender_feedback_request_model/tender_feedback_request_model.dart';
|
||||
@@ -14,12 +17,15 @@ class HomeRepository {
|
||||
required HomeService homeService,
|
||||
required YourTendersService yourTendersService,
|
||||
required LikedTendersService likedTendersService,
|
||||
required TenderSubmissionsService tenderSubmissionsService,
|
||||
}) : _homeService = homeService,
|
||||
_yourTendersService = yourTendersService,
|
||||
_likedTendersService = likedTendersService;
|
||||
_likedTendersService = likedTendersService,
|
||||
_tenderSubmissionsService = tenderSubmissionsService;
|
||||
final HomeService _homeService;
|
||||
final YourTendersService _yourTendersService;
|
||||
final LikedTendersService _likedTendersService;
|
||||
final TenderSubmissionsService _tenderSubmissionsService;
|
||||
|
||||
Future<Result<RecommendedTendersResponse>> getHomeRecommendedTenders({
|
||||
required int limit,
|
||||
@@ -38,6 +44,12 @@ class HomeRepository {
|
||||
return _homeService.getTendersApprovalsStats();
|
||||
}
|
||||
|
||||
Future<Result<FeedbackStatResponse>> getCustomerFeedbackStats() =>
|
||||
_homeService.getFeedbackStats();
|
||||
|
||||
Future<Result<TenderSubmissionStatsResponse>> getSubmissionStats() =>
|
||||
_tenderSubmissionsService.getStats();
|
||||
|
||||
/// Returns how many tenders the current user has liked (not company-wide).
|
||||
Future<Result<int>> getUserLikedTendersCount() async {
|
||||
final result = await _likedTendersService.getLikedTenders(
|
||||
|
||||
@@ -4,17 +4,22 @@ import 'package:tm_app/data/services/model/liked_tenders_response/liked_tenders_
|
||||
import 'package:tm_app/data/services/model/request_models/get_tenders_request_model/get_tenders_request_model.dart';
|
||||
import 'package:tm_app/data/services/model/tender_approvals_response/tender_approvals_response.dart';
|
||||
import 'package:tm_app/data/services/your_tenders_service.dart';
|
||||
import 'package:tm_app/data/services/tender_submissions_service.dart';
|
||||
import 'package:tm_app/data/services/model/tender_submission/tender_submission.dart';
|
||||
|
||||
import '../services/model/request_models/tender_feedback_request_model/tender_feedback_request_model.dart';
|
||||
|
||||
class YourTendersRepository {
|
||||
final YourTendersService _yourTendersService;
|
||||
final LikedTendersService _likedTendersService;
|
||||
final TenderSubmissionsService _tenderSubmissionsService;
|
||||
YourTendersRepository({
|
||||
required YourTendersService yourTendersService,
|
||||
required LikedTendersService likedTendersService,
|
||||
required TenderSubmissionsService tenderSubmissionsService,
|
||||
}) : _yourTendersService = yourTendersService,
|
||||
_likedTendersService = likedTendersService;
|
||||
_likedTendersService = likedTendersService,
|
||||
_tenderSubmissionsService = tenderSubmissionsService;
|
||||
|
||||
Future<Result<TenderApprovalsResponse>> getTenders({
|
||||
required GetTendersRequestModel requestModel,
|
||||
@@ -27,4 +32,41 @@ class YourTendersRepository {
|
||||
}) {
|
||||
return _likedTendersService.getLikedTenders(requestModel: requestModel);
|
||||
}
|
||||
|
||||
Future<Result<TenderSubmissionsResponse>> getSubmissions({
|
||||
required String stage,
|
||||
int limit = 20,
|
||||
int offset = 0,
|
||||
}) => _tenderSubmissionsService.getSubmissions(
|
||||
stages: [stage],
|
||||
limit: limit,
|
||||
offset: offset,
|
||||
);
|
||||
|
||||
Future<Result<TenderSubmissionResponse>> getSubmissionById(String id) =>
|
||||
_tenderSubmissionsService.getById(id);
|
||||
|
||||
Future<Result<TenderSubmissionResponse>> getSubmissionByTender(
|
||||
String tenderId,
|
||||
) => _tenderSubmissionsService.getByTender(tenderId);
|
||||
|
||||
Future<Result<TenderSubmissionResponse>> ensureSubmission(
|
||||
String tenderId, {
|
||||
String? companyId,
|
||||
}) => _tenderSubmissionsService.ensure(tenderId, companyId: companyId);
|
||||
|
||||
Future<Result<TenderSubmissionResponse>> updateSubmissionStatus({
|
||||
required String id,
|
||||
required String status,
|
||||
String? reason,
|
||||
String? description,
|
||||
}) => _tenderSubmissionsService.updateStatus(
|
||||
id: id,
|
||||
status: status,
|
||||
reason: reason,
|
||||
description: description,
|
||||
);
|
||||
|
||||
Future<Result<TenderSubmissionStatsResponse>> getSubmissionStats() =>
|
||||
_tenderSubmissionsService.getStats();
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ class HomeApi {
|
||||
}
|
||||
|
||||
static const String tenderApprovalStats = '/api/v1/tender-approvals/stats';
|
||||
static const String statsCompany = '/api/v1/feedback/stats/company';
|
||||
static const String statsCustomer = '/api/v1/feedback/stats/customer';
|
||||
static const String checkUnreadNotifications =
|
||||
'/api/v1/notifications?seen=false&limit=1&event_type=PUSH';
|
||||
}
|
||||
|
||||
@@ -9,8 +9,8 @@ class LikedTendersApi {
|
||||
required String dateTo,
|
||||
}) {
|
||||
if (dateFrom.isNotEmpty && dateTo.isNotEmpty) {
|
||||
return '$tendersFeedback?feedback_type=$feedbackType&limit=$limit&offset=$offset&date_from=$dateFrom&date_to=$dateTo';
|
||||
return '$tendersFeedback?feedback_type=$feedbackType&limit=$limit&offset=$offset&include_total=true&date_from=$dateFrom&date_to=$dateTo';
|
||||
}
|
||||
return '$tendersFeedback?feedback_type=$feedbackType&limit=$limit&offset=$offset';
|
||||
return '$tendersFeedback?feedback_type=$feedbackType&limit=$limit&offset=$offset&include_total=true';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
class TenderSubmissionsApi {
|
||||
static const String base = '/api/v1/tender-submissions';
|
||||
|
||||
static const String list = base;
|
||||
static const String stats = '$base/stats';
|
||||
static String byId(String id) => '$base/$id';
|
||||
static String byTender(String tenderId) => '$base/tender/$tenderId';
|
||||
static String ensure(String tenderId) => '$base/tender/$tenderId/ensure';
|
||||
static String status(String id) => '$base/$id/status';
|
||||
}
|
||||
@@ -35,7 +35,7 @@ class HomeService {
|
||||
|
||||
Future<Result<FeedbackStatResponse>> getFeedbackStats() async {
|
||||
final result = await _networkManager.makeRequest(
|
||||
HomeApi.statsCompany,
|
||||
HomeApi.statsCustomer,
|
||||
(json) => FeedbackStatResponse.fromJson(json),
|
||||
method: 'GET',
|
||||
);
|
||||
|
||||
@@ -22,11 +22,20 @@ class LikedTendersService {
|
||||
dateTo: requestModel.dateTo,
|
||||
);
|
||||
|
||||
final result = await _networkManager.makeRequest(
|
||||
uri,
|
||||
(json) => LikedTendersResponse.fromJson(json),
|
||||
method: 'GET',
|
||||
);
|
||||
final result = await _networkManager.makeRequest(uri, (json) {
|
||||
// Feedback pagination is returned at the envelope root, while the
|
||||
// legacy app model stores it beside data.feedback.
|
||||
final normalized = Map<String, dynamic>.from(json);
|
||||
final data = normalized['data'];
|
||||
final meta = normalized['meta'];
|
||||
if (data is Map && meta is Map) {
|
||||
normalized['data'] = {
|
||||
...Map<String, dynamic>.from(data),
|
||||
'meta': Map<String, dynamic>.from(meta),
|
||||
};
|
||||
}
|
||||
return LikedTendersResponse.fromJson(normalized);
|
||||
}, method: 'GET');
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
+3
-6
@@ -10,16 +10,13 @@ part 'recommended_tenders_response.g.dart';
|
||||
@freezed
|
||||
abstract class RecommendedTendersResponse with _$RecommendedTendersResponse {
|
||||
@JsonSerializable(explicitToJson: true)
|
||||
const factory
|
||||
RecommendedTendersResponse({
|
||||
required bool? succes,
|
||||
const factory RecommendedTendersResponse({
|
||||
@JsonKey(name: 'success') required bool? success,
|
||||
required String? message,
|
||||
required ErrorModel? error,
|
||||
required RecommendedTendersData? data,
|
||||
|
||||
}) = _RecommendedTendersResponse;
|
||||
|
||||
factory
|
||||
RecommendedTendersResponse.fromJson(Map<String, dynamic> json) =>
|
||||
factory RecommendedTendersResponse.fromJson(Map<String, dynamic> json) =>
|
||||
_$RecommendedTendersResponseFromJson(json);
|
||||
}
|
||||
|
||||
+21
-21
@@ -15,7 +15,7 @@ T _$identity<T>(T value) => value;
|
||||
/// @nodoc
|
||||
mixin _$RecommendedTendersResponse {
|
||||
|
||||
bool? get succes; String? get message; ErrorModel? get error; RecommendedTendersData? get data;
|
||||
bool? get success; String? get message; ErrorModel? get error; RecommendedTendersData? get data;
|
||||
/// Create a copy of RecommendedTendersResponse
|
||||
/// with the given fields replaced by the non-null parameter values.
|
||||
@JsonKey(includeFromJson: false, includeToJson: false)
|
||||
@@ -28,16 +28,16 @@ $RecommendedTendersResponseCopyWith<RecommendedTendersResponse> get copyWith =>
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) {
|
||||
return identical(this, other) || (other.runtimeType == runtimeType&&other is RecommendedTendersResponse&&(identical(other.succes, succes) || other.succes == succes)&&(identical(other.message, message) || other.message == message)&&(identical(other.error, error) || other.error == error)&&(identical(other.data, data) || other.data == data));
|
||||
return identical(this, other) || (other.runtimeType == runtimeType&&other is RecommendedTendersResponse&&(identical(other.success, success) || other.success == success)&&(identical(other.message, message) || other.message == message)&&(identical(other.error, error) || other.error == error)&&(identical(other.data, data) || other.data == data));
|
||||
}
|
||||
|
||||
@JsonKey(includeFromJson: false, includeToJson: false)
|
||||
@override
|
||||
int get hashCode => Object.hash(runtimeType,succes,message,error,data);
|
||||
int get hashCode => Object.hash(runtimeType,success,message,error,data);
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'RecommendedTendersResponse(succes: $succes, message: $message, error: $error, data: $data)';
|
||||
return 'RecommendedTendersResponse(success: $success, message: $message, error: $error, data: $data)';
|
||||
}
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ abstract mixin class $RecommendedTendersResponseCopyWith<$Res> {
|
||||
factory $RecommendedTendersResponseCopyWith(RecommendedTendersResponse value, $Res Function(RecommendedTendersResponse) _then) = _$RecommendedTendersResponseCopyWithImpl;
|
||||
@useResult
|
||||
$Res call({
|
||||
bool? succes, String? message, ErrorModel? error, RecommendedTendersData? data
|
||||
bool? success, String? message, ErrorModel? error, RecommendedTendersData? data
|
||||
});
|
||||
|
||||
|
||||
@@ -65,9 +65,9 @@ class _$RecommendedTendersResponseCopyWithImpl<$Res>
|
||||
|
||||
/// Create a copy of RecommendedTendersResponse
|
||||
/// with the given fields replaced by the non-null parameter values.
|
||||
@pragma('vm:prefer-inline') @override $Res call({Object? succes = freezed,Object? message = freezed,Object? error = freezed,Object? data = freezed,}) {
|
||||
@pragma('vm:prefer-inline') @override $Res call({Object? success = freezed,Object? message = freezed,Object? error = freezed,Object? data = freezed,}) {
|
||||
return _then(_self.copyWith(
|
||||
succes: freezed == succes ? _self.succes : succes // ignore: cast_nullable_to_non_nullable
|
||||
success: freezed == success ? _self.success : success // ignore: cast_nullable_to_non_nullable
|
||||
as bool?,message: freezed == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
|
||||
as String?,error: freezed == error ? _self.error : error // ignore: cast_nullable_to_non_nullable
|
||||
as ErrorModel?,data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
|
||||
@@ -180,10 +180,10 @@ return $default(_that);case _:
|
||||
/// }
|
||||
/// ```
|
||||
|
||||
@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool? succes, String? message, ErrorModel? error, RecommendedTendersData? data)? $default,{required TResult orElse(),}) {final _that = this;
|
||||
@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool? success, String? message, ErrorModel? error, RecommendedTendersData? data)? $default,{required TResult orElse(),}) {final _that = this;
|
||||
switch (_that) {
|
||||
case _RecommendedTendersResponse() when $default != null:
|
||||
return $default(_that.succes,_that.message,_that.error,_that.data);case _:
|
||||
return $default(_that.success,_that.message,_that.error,_that.data);case _:
|
||||
return orElse();
|
||||
|
||||
}
|
||||
@@ -201,10 +201,10 @@ return $default(_that.succes,_that.message,_that.error,_that.data);case _:
|
||||
/// }
|
||||
/// ```
|
||||
|
||||
@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool? succes, String? message, ErrorModel? error, RecommendedTendersData? data) $default,) {final _that = this;
|
||||
@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool? success, String? message, ErrorModel? error, RecommendedTendersData? data) $default,) {final _that = this;
|
||||
switch (_that) {
|
||||
case _RecommendedTendersResponse():
|
||||
return $default(_that.succes,_that.message,_that.error,_that.data);case _:
|
||||
return $default(_that.success,_that.message,_that.error,_that.data);case _:
|
||||
throw StateError('Unexpected subclass');
|
||||
|
||||
}
|
||||
@@ -221,10 +221,10 @@ return $default(_that.succes,_that.message,_that.error,_that.data);case _:
|
||||
/// }
|
||||
/// ```
|
||||
|
||||
@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool? succes, String? message, ErrorModel? error, RecommendedTendersData? data)? $default,) {final _that = this;
|
||||
@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool? success, String? message, ErrorModel? error, RecommendedTendersData? data)? $default,) {final _that = this;
|
||||
switch (_that) {
|
||||
case _RecommendedTendersResponse() when $default != null:
|
||||
return $default(_that.succes,_that.message,_that.error,_that.data);case _:
|
||||
return $default(_that.success,_that.message,_that.error,_that.data);case _:
|
||||
return null;
|
||||
|
||||
}
|
||||
@@ -236,10 +236,10 @@ return $default(_that.succes,_that.message,_that.error,_that.data);case _:
|
||||
|
||||
@JsonSerializable(explicitToJson: true)
|
||||
class _RecommendedTendersResponse implements RecommendedTendersResponse {
|
||||
const _RecommendedTendersResponse({required this.succes, required this.message, required this.error, required this.data});
|
||||
const _RecommendedTendersResponse({required this.success, required this.message, required this.error, required this.data});
|
||||
factory _RecommendedTendersResponse.fromJson(Map<String, dynamic> json) => _$RecommendedTendersResponseFromJson(json);
|
||||
|
||||
@override final bool? succes;
|
||||
@override final bool? success;
|
||||
@override final String? message;
|
||||
@override final ErrorModel? error;
|
||||
@override final RecommendedTendersData? data;
|
||||
@@ -257,16 +257,16 @@ Map<String, dynamic> toJson() {
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) {
|
||||
return identical(this, other) || (other.runtimeType == runtimeType&&other is _RecommendedTendersResponse&&(identical(other.succes, succes) || other.succes == succes)&&(identical(other.message, message) || other.message == message)&&(identical(other.error, error) || other.error == error)&&(identical(other.data, data) || other.data == data));
|
||||
return identical(this, other) || (other.runtimeType == runtimeType&&other is _RecommendedTendersResponse&&(identical(other.success, success) || other.success == success)&&(identical(other.message, message) || other.message == message)&&(identical(other.error, error) || other.error == error)&&(identical(other.data, data) || other.data == data));
|
||||
}
|
||||
|
||||
@JsonKey(includeFromJson: false, includeToJson: false)
|
||||
@override
|
||||
int get hashCode => Object.hash(runtimeType,succes,message,error,data);
|
||||
int get hashCode => Object.hash(runtimeType,success,message,error,data);
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'RecommendedTendersResponse(succes: $succes, message: $message, error: $error, data: $data)';
|
||||
return 'RecommendedTendersResponse(success: $success, message: $message, error: $error, data: $data)';
|
||||
}
|
||||
|
||||
|
||||
@@ -277,7 +277,7 @@ abstract mixin class _$RecommendedTendersResponseCopyWith<$Res> implements $Reco
|
||||
factory _$RecommendedTendersResponseCopyWith(_RecommendedTendersResponse value, $Res Function(_RecommendedTendersResponse) _then) = __$RecommendedTendersResponseCopyWithImpl;
|
||||
@override @useResult
|
||||
$Res call({
|
||||
bool? succes, String? message, ErrorModel? error, RecommendedTendersData? data
|
||||
bool? success, String? message, ErrorModel? error, RecommendedTendersData? data
|
||||
});
|
||||
|
||||
|
||||
@@ -294,9 +294,9 @@ class __$RecommendedTendersResponseCopyWithImpl<$Res>
|
||||
|
||||
/// Create a copy of RecommendedTendersResponse
|
||||
/// with the given fields replaced by the non-null parameter values.
|
||||
@override @pragma('vm:prefer-inline') $Res call({Object? succes = freezed,Object? message = freezed,Object? error = freezed,Object? data = freezed,}) {
|
||||
@override @pragma('vm:prefer-inline') $Res call({Object? success = freezed,Object? message = freezed,Object? error = freezed,Object? data = freezed,}) {
|
||||
return _then(_RecommendedTendersResponse(
|
||||
succes: freezed == succes ? _self.succes : succes // ignore: cast_nullable_to_non_nullable
|
||||
success: freezed == success ? _self.success : success // ignore: cast_nullable_to_non_nullable
|
||||
as bool?,message: freezed == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
|
||||
as String?,error: freezed == error ? _self.error : error // ignore: cast_nullable_to_non_nullable
|
||||
as ErrorModel?,data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
|
||||
|
||||
+2
-2
@@ -9,7 +9,7 @@ part of 'recommended_tenders_response.dart';
|
||||
_RecommendedTendersResponse _$RecommendedTendersResponseFromJson(
|
||||
Map<String, dynamic> json,
|
||||
) => _RecommendedTendersResponse(
|
||||
succes: json['succes'] as bool?,
|
||||
success: json['success'] as bool?,
|
||||
message: json['message'] as String?,
|
||||
error:
|
||||
json['error'] == null
|
||||
@@ -26,7 +26,7 @@ _RecommendedTendersResponse _$RecommendedTendersResponseFromJson(
|
||||
Map<String, dynamic> _$RecommendedTendersResponseToJson(
|
||||
_RecommendedTendersResponse instance,
|
||||
) => <String, dynamic>{
|
||||
'succes': instance.succes,
|
||||
'success': instance.success,
|
||||
'message': instance.message,
|
||||
'error': instance.error?.toJson(),
|
||||
'data': instance.data?.toJson(),
|
||||
|
||||
@@ -0,0 +1,235 @@
|
||||
import 'package:tm_app/core/utils/date_utils.dart';
|
||||
import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
|
||||
|
||||
class TenderSubmissionResponse {
|
||||
const TenderSubmissionResponse({
|
||||
required this.success,
|
||||
required this.message,
|
||||
required this.data,
|
||||
});
|
||||
|
||||
final bool success;
|
||||
final String? message;
|
||||
final TenderSubmission? data;
|
||||
|
||||
factory TenderSubmissionResponse.fromJson(Map<String, dynamic> json) {
|
||||
final data = json['data'];
|
||||
return TenderSubmissionResponse(
|
||||
success: json['success'] == true,
|
||||
message: json['message'] as String?,
|
||||
data:
|
||||
data is Map<String, dynamic> ? TenderSubmission.fromJson(data) : null,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class TenderSubmissionsResponse {
|
||||
const TenderSubmissionsResponse({
|
||||
required this.success,
|
||||
required this.message,
|
||||
required this.data,
|
||||
required this.meta,
|
||||
});
|
||||
|
||||
final bool success;
|
||||
final String? message;
|
||||
final List<TenderSubmission> data;
|
||||
final TenderSubmissionsMeta? meta;
|
||||
|
||||
factory TenderSubmissionsResponse.fromJson(Map<String, dynamic> json) {
|
||||
final items = json['data'];
|
||||
return TenderSubmissionsResponse(
|
||||
success: json['success'] == true,
|
||||
message: json['message'] as String?,
|
||||
data:
|
||||
items is List
|
||||
? items
|
||||
.whereType<Map>()
|
||||
.map(
|
||||
(item) => TenderSubmission.fromJson(
|
||||
Map<String, dynamic>.from(item),
|
||||
),
|
||||
)
|
||||
.toList()
|
||||
: const [],
|
||||
meta:
|
||||
json['meta'] is Map
|
||||
? TenderSubmissionsMeta.fromJson(
|
||||
Map<String, dynamic>.from(json['meta'] as Map),
|
||||
)
|
||||
: null,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class TenderSubmission {
|
||||
const TenderSubmission({
|
||||
required this.id,
|
||||
required this.tenderId,
|
||||
required this.companyId,
|
||||
required this.customerId,
|
||||
required this.status,
|
||||
required this.stage,
|
||||
required this.submissionMode,
|
||||
required this.statusHistory,
|
||||
required this.createdAt,
|
||||
required this.updatedAt,
|
||||
required this.tender,
|
||||
});
|
||||
|
||||
final String id;
|
||||
final String tenderId;
|
||||
final String? companyId;
|
||||
final String? customerId;
|
||||
final String status;
|
||||
final String stage;
|
||||
final String? submissionMode;
|
||||
final List<TenderSubmissionHistory> statusHistory;
|
||||
final int? createdAt;
|
||||
final int? updatedAt;
|
||||
final TenderData? tender;
|
||||
|
||||
bool get isTerminal =>
|
||||
status == 'rejected' || status == 'contract' || status == 'not_applied';
|
||||
|
||||
factory TenderSubmission.fromJson(Map<String, dynamic> json) {
|
||||
final history = json['status_history'];
|
||||
final tenderJson = json['tender'];
|
||||
return TenderSubmission(
|
||||
id: json['id']?.toString() ?? '',
|
||||
tenderId: json['tender_id']?.toString() ?? '',
|
||||
companyId: json['company_id']?.toString(),
|
||||
customerId: json['customer_id']?.toString(),
|
||||
status: json['status']?.toString() ?? 'opportunity',
|
||||
stage: json['stage']?.toString() ?? 'opportunity',
|
||||
submissionMode: json['submission_mode']?.toString(),
|
||||
statusHistory:
|
||||
history is List
|
||||
? history
|
||||
.whereType<Map>()
|
||||
.map(
|
||||
(item) => TenderSubmissionHistory.fromJson(
|
||||
Map<String, dynamic>.from(item),
|
||||
),
|
||||
)
|
||||
.toList()
|
||||
: const [],
|
||||
createdAt: unixTimestampFromJson(json['created_at']),
|
||||
updatedAt: unixTimestampFromJson(json['updated_at']),
|
||||
tender:
|
||||
tenderJson is Map
|
||||
? TenderData.fromJson(Map<String, dynamic>.from(tenderJson))
|
||||
: null,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class TenderSubmissionHistory {
|
||||
const TenderSubmissionHistory({
|
||||
required this.status,
|
||||
required this.reason,
|
||||
required this.changedBy,
|
||||
required this.changedAt,
|
||||
required this.description,
|
||||
});
|
||||
|
||||
final String status;
|
||||
final String? reason;
|
||||
final String? changedBy;
|
||||
final int? changedAt;
|
||||
final String? description;
|
||||
|
||||
factory TenderSubmissionHistory.fromJson(Map<String, dynamic> json) {
|
||||
return TenderSubmissionHistory(
|
||||
status: json['status']?.toString() ?? '',
|
||||
reason: json['reason']?.toString(),
|
||||
changedBy: json['changed_by']?.toString(),
|
||||
changedAt: unixTimestampFromJson(json['changed_at']),
|
||||
description: json['description']?.toString(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class TenderSubmissionsMeta {
|
||||
const TenderSubmissionsMeta({
|
||||
required this.total,
|
||||
required this.limit,
|
||||
required this.offset,
|
||||
required this.page,
|
||||
required this.pages,
|
||||
required this.hasMore,
|
||||
});
|
||||
|
||||
final int total;
|
||||
final int limit;
|
||||
final int offset;
|
||||
final int page;
|
||||
final int pages;
|
||||
final bool hasMore;
|
||||
|
||||
factory TenderSubmissionsMeta.fromJson(Map<String, dynamic> json) {
|
||||
int number(String key) => (json[key] as num?)?.toInt() ?? 0;
|
||||
return TenderSubmissionsMeta(
|
||||
total: number('total'),
|
||||
limit: number('limit'),
|
||||
offset: number('offset'),
|
||||
page: number('page'),
|
||||
pages: number('pages'),
|
||||
hasMore: json['has_more'] == true,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class TenderSubmissionStatsResponse {
|
||||
const TenderSubmissionStatsResponse({
|
||||
required this.success,
|
||||
required this.data,
|
||||
});
|
||||
|
||||
final bool success;
|
||||
final TenderSubmissionStats? data;
|
||||
|
||||
factory TenderSubmissionStatsResponse.fromJson(Map<String, dynamic> json) {
|
||||
return TenderSubmissionStatsResponse(
|
||||
success: json['success'] == true,
|
||||
data:
|
||||
json['data'] is Map
|
||||
? TenderSubmissionStats.fromJson(
|
||||
Map<String, dynamic>.from(json['data'] as Map),
|
||||
)
|
||||
: null,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class TenderSubmissionStats {
|
||||
const TenderSubmissionStats({
|
||||
required this.companyId,
|
||||
required this.total,
|
||||
required this.byStage,
|
||||
required this.byStatus,
|
||||
required this.lastUpdated,
|
||||
});
|
||||
|
||||
final String? companyId;
|
||||
final int total;
|
||||
final Map<String, int> byStage;
|
||||
final Map<String, int> byStatus;
|
||||
final int? lastUpdated;
|
||||
|
||||
factory TenderSubmissionStats.fromJson(Map<String, dynamic> json) {
|
||||
Map<String, int> counts(value) =>
|
||||
value is Map
|
||||
? value.map(
|
||||
(key, value) => MapEntry(key.toString(), (value as num).toInt()),
|
||||
)
|
||||
: const {};
|
||||
return TenderSubmissionStats(
|
||||
companyId: json['company_id']?.toString(),
|
||||
total: (json['total'] as num?)?.toInt() ?? 0,
|
||||
byStage: counts(json['by_stage']),
|
||||
byStatus: counts(json['by_status']),
|
||||
lastUpdated: unixTimestampFromJson(json['last_updated']),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
import 'package:tm_app/core/network/network_manager.dart';
|
||||
import 'package:tm_app/core/utils/result.dart';
|
||||
import 'package:tm_app/data/services/api/tender_submissions_api.dart';
|
||||
import 'package:tm_app/data/services/model/tender_submission/tender_submission.dart';
|
||||
|
||||
class TenderSubmissionsService {
|
||||
TenderSubmissionsService({required NetworkManager networkManager})
|
||||
: _networkManager = networkManager;
|
||||
|
||||
final NetworkManager _networkManager;
|
||||
|
||||
Future<Result<TenderSubmissionsResponse>> getSubmissions({
|
||||
List<String>? statuses,
|
||||
List<String>? stages,
|
||||
int? createdFrom,
|
||||
int? createdTo,
|
||||
int limit = 20,
|
||||
int offset = 0,
|
||||
String sortBy = 'updated_at',
|
||||
String sortOrder = 'desc',
|
||||
}) {
|
||||
return _networkManager.makeRequest(
|
||||
TenderSubmissionsApi.list,
|
||||
TenderSubmissionsResponse.fromJson,
|
||||
queryParameters: {
|
||||
if (statuses?.isNotEmpty == true) 'status': statuses,
|
||||
if (stages?.isNotEmpty == true) 'stage': stages,
|
||||
if (createdFrom != null) 'created_from': createdFrom,
|
||||
if (createdTo != null) 'created_to': createdTo,
|
||||
'limit': limit,
|
||||
'offset': offset,
|
||||
'sort_by': sortBy,
|
||||
'sort_order': sortOrder,
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
Future<Result<TenderSubmissionResponse>> getById(String id) =>
|
||||
_networkManager.makeRequest(
|
||||
TenderSubmissionsApi.byId(id),
|
||||
TenderSubmissionResponse.fromJson,
|
||||
);
|
||||
|
||||
Future<Result<TenderSubmissionResponse>> getByTender(String tenderId) =>
|
||||
_networkManager.makeRequest(
|
||||
TenderSubmissionsApi.byTender(tenderId),
|
||||
TenderSubmissionResponse.fromJson,
|
||||
);
|
||||
|
||||
Future<Result<TenderSubmissionResponse>> ensure(
|
||||
String tenderId, {
|
||||
String? companyId,
|
||||
}) => _networkManager.makeRequest(
|
||||
TenderSubmissionsApi.ensure(tenderId),
|
||||
TenderSubmissionResponse.fromJson,
|
||||
method: 'POST',
|
||||
queryParameters: {
|
||||
if (companyId?.isNotEmpty == true) 'company_id': companyId,
|
||||
},
|
||||
);
|
||||
|
||||
Future<Result<TenderSubmissionResponse>> updateStatus({
|
||||
required String id,
|
||||
required String status,
|
||||
String? reason,
|
||||
String? description,
|
||||
}) => _networkManager.makeRequest(
|
||||
TenderSubmissionsApi.status(id),
|
||||
TenderSubmissionResponse.fromJson,
|
||||
method: 'PATCH',
|
||||
data: {
|
||||
'status': status,
|
||||
if (reason?.trim().isNotEmpty == true) 'reason': reason!.trim(),
|
||||
if (description?.trim().isNotEmpty == true)
|
||||
'description': description!.trim(),
|
||||
},
|
||||
);
|
||||
|
||||
Future<Result<TenderSubmissionStatsResponse>> getStats() =>
|
||||
_networkManager.makeRequest(
|
||||
TenderSubmissionsApi.stats,
|
||||
TenderSubmissionStatsResponse.fromJson,
|
||||
);
|
||||
}
|
||||
@@ -1,19 +1,15 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:tm_app/core/network/app_exceptions.dart';
|
||||
import 'package:tm_app/core/utils/result.dart';
|
||||
import 'package:tm_app/data/repositories/company_ai_repository.dart';
|
||||
import 'package:tm_app/data/repositories/home_repository.dart';
|
||||
import 'package:tm_app/data/services/model/recommend_response/recommend_response.dart';
|
||||
import 'package:tm_app/data/services/model/recommendation_item/recommendation_item.dart';
|
||||
import 'package:tm_app/data/services/model/recommended_tenders_response/recommended_tenders_response.dart';
|
||||
import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
|
||||
|
||||
/// Drives the "Recommended" (AI) tab in the tenders section.
|
||||
/// Drives the "Recommended" tab in the tenders section.
|
||||
///
|
||||
/// Calls `POST /api/v1/recommend`. When the AI service is unavailable (503) it
|
||||
/// falls back to the legacy CPV/keyword list (`GET /api/v1/tenders/recommend`),
|
||||
/// and when the AI returns no results shortly after onboarding it surfaces a
|
||||
/// "still learning" hint instead of an empty error.
|
||||
/// Calls `GET /api/v1/tenders/recommend`. When the result is empty shortly
|
||||
/// after onboarding it surfaces a "still learning" hint instead of an empty
|
||||
/// error.
|
||||
class AiRecommendationsViewModel with ChangeNotifier {
|
||||
AiRecommendationsViewModel({
|
||||
required CompanyAiRepository companyAiRepository,
|
||||
@@ -26,21 +22,17 @@ class AiRecommendationsViewModel with ChangeNotifier {
|
||||
|
||||
/// How long after onboarding an empty result is treated as "still learning".
|
||||
static const Duration _stillLearningWindow = Duration(minutes: 30);
|
||||
static const int _fallbackPageSize = 20;
|
||||
static const int _pageSize = 20;
|
||||
|
||||
bool _isLoading = false;
|
||||
String? _errorMessage;
|
||||
List<RecommendationItem> _items = const [];
|
||||
List<TenderData> _fallbackTenders = const [];
|
||||
bool _usingFallback = false;
|
||||
List<TenderData> _recommendedTenders = const [];
|
||||
bool _stillLearning = false;
|
||||
bool _hasLoaded = false;
|
||||
|
||||
bool get isLoading => _isLoading;
|
||||
String? get errorMessage => _errorMessage;
|
||||
List<RecommendationItem> get items => _items;
|
||||
List<TenderData> get fallbackTenders => _fallbackTenders;
|
||||
bool get usingFallback => _usingFallback;
|
||||
List<TenderData> get recommendedTenders => _recommendedTenders;
|
||||
bool get stillLearning => _stillLearning;
|
||||
|
||||
/// True once a load has completed (used to distinguish "no results" from
|
||||
@@ -51,8 +43,7 @@ class AiRecommendationsViewModel with ChangeNotifier {
|
||||
bool get isEmpty =>
|
||||
!_isLoading &&
|
||||
_errorMessage == null &&
|
||||
_items.isEmpty &&
|
||||
_fallbackTenders.isEmpty;
|
||||
_recommendedTenders.isEmpty;
|
||||
|
||||
/// Loads recommendations if they haven't been loaded yet this session.
|
||||
Future<void> loadIfNeeded() async {
|
||||
@@ -62,28 +53,32 @@ class AiRecommendationsViewModel with ChangeNotifier {
|
||||
await loadRecommendations();
|
||||
}
|
||||
|
||||
/// Loads AI recommendations, applying the 503 fallback and empty-state logic.
|
||||
/// Loads recommended tenders for the Recommended tab.
|
||||
Future<void> loadRecommendations() async {
|
||||
_isLoading = true;
|
||||
_errorMessage = null;
|
||||
_usingFallback = false;
|
||||
_stillLearning = false;
|
||||
notifyListeners();
|
||||
|
||||
final result = await _companyAiRepository.getRecommendations();
|
||||
final result = await _homeRepository.getHomeRecommendedTenders(
|
||||
limit: _pageSize,
|
||||
offset: 0,
|
||||
);
|
||||
|
||||
var loadedSuccessfully = false;
|
||||
|
||||
switch (result) {
|
||||
case Ok<RecommendResponse>():
|
||||
_items = result.value.data ?? const [];
|
||||
_fallbackTenders = const [];
|
||||
if (_items.isEmpty) {
|
||||
case Ok<RecommendedTendersResponse>():
|
||||
_recommendedTenders =
|
||||
result.value.data?.tenders.whereType<TenderData>().toList() ??
|
||||
const [];
|
||||
if (_recommendedTenders.isEmpty) {
|
||||
_stillLearning = _onboardingWasRecent();
|
||||
}
|
||||
loadedSuccessfully = true;
|
||||
case Error<RecommendResponse>():
|
||||
loadedSuccessfully = await _handleError(result.error);
|
||||
case Error<RecommendedTendersResponse>():
|
||||
_recommendedTenders = const [];
|
||||
_errorMessage = result.error.toString();
|
||||
}
|
||||
|
||||
_isLoading = false;
|
||||
@@ -94,39 +89,6 @@ class AiRecommendationsViewModel with ChangeNotifier {
|
||||
/// Pull-to-refresh: always re-fetches.
|
||||
Future<void> refresh() => loadRecommendations();
|
||||
|
||||
Future<bool> _handleError(Exception error) async {
|
||||
// 503 means the AI service isn't configured/available — fall back to the
|
||||
// legacy recommend list rather than showing an error. NetworkManager only
|
||||
// exposes this status when Dio received an HTTP response; connection and
|
||||
// timeout failures have no reliable status code and should remain retryable.
|
||||
if (error is AppException && error.statusCode == 503) {
|
||||
await _loadFallback();
|
||||
return _errorMessage == null;
|
||||
}
|
||||
_items = const [];
|
||||
_fallbackTenders = const [];
|
||||
_errorMessage = error.toString();
|
||||
return false;
|
||||
}
|
||||
|
||||
Future<void> _loadFallback() async {
|
||||
final result = await _homeRepository.getHomeRecommendedTenders(
|
||||
limit: _fallbackPageSize,
|
||||
offset: 0,
|
||||
);
|
||||
|
||||
switch (result) {
|
||||
case Ok<RecommendedTendersResponse>():
|
||||
_items = const [];
|
||||
_fallbackTenders =
|
||||
result.value.data?.tenders.whereType<TenderData>().toList() ??
|
||||
const [];
|
||||
_usingFallback = true;
|
||||
case Error<RecommendedTendersResponse>():
|
||||
_errorMessage = result.error.toString();
|
||||
}
|
||||
}
|
||||
|
||||
bool _onboardingWasRecent() {
|
||||
final startedAt = _companyAiRepository.lastOnboardingStartedAt();
|
||||
if (startedAt == null) {
|
||||
|
||||
@@ -4,6 +4,8 @@ import 'package:tm_app/data/services/model/recommended_tenders_response/recommen
|
||||
import 'package:tm_app/data/services/model/tender_approvals_response/tender_approvals_response.dart';
|
||||
import 'package:tm_app/data/services/model/tender_approvals_stats_response/tender_approvals_stats_response.dart';
|
||||
import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
|
||||
import 'package:tm_app/data/services/model/feedback_stats_response/feedback_stat_response.dart';
|
||||
import 'package:tm_app/data/services/model/tender_submission/tender_submission.dart';
|
||||
|
||||
import '../data/repositories/home_repository.dart';
|
||||
import '../data/services/model/home/home_response/home_response_model.dart';
|
||||
@@ -44,6 +46,7 @@ class HomeViewModel with ChangeNotifier {
|
||||
|
||||
RecommendedTendersResponse? _recommendedTendersResponse;
|
||||
TenderApprovalsStatsResponse? tenderApprovalsStateResponse;
|
||||
TenderSubmissionStats? tenderSubmissionStats;
|
||||
int userLikedTendersCount = 0;
|
||||
final List<TenderData> _tenders = [];
|
||||
final int _pageSize = 10;
|
||||
@@ -71,11 +74,15 @@ class HomeViewModel with ChangeNotifier {
|
||||
_isRecommendedMode = false;
|
||||
data = null;
|
||||
tenderApprovalsStateResponse = null;
|
||||
tenderSubmissionStats = null;
|
||||
notifyListeners();
|
||||
|
||||
await getApprovedStates();
|
||||
await getYourTenders(reset: true);
|
||||
await loadUserLikedTendersCount();
|
||||
await Future.wait([
|
||||
getApprovedStates(),
|
||||
getYourTenders(reset: true),
|
||||
loadUserLikedTendersCount(),
|
||||
loadSubmissionStats(),
|
||||
]);
|
||||
|
||||
if (_errorMessage != null) {
|
||||
_isLoading = false;
|
||||
@@ -199,19 +206,38 @@ class HomeViewModel with ChangeNotifier {
|
||||
}
|
||||
|
||||
Future<void> loadUserLikedTendersCount() async {
|
||||
final result = await _homeRepository.getUserLikedTendersCount();
|
||||
final result = await _homeRepository.getCustomerFeedbackStats();
|
||||
|
||||
switch (result) {
|
||||
case Ok<int>():
|
||||
userLikedTendersCount = result.value;
|
||||
case Ok<FeedbackStatResponse>():
|
||||
userLikedTendersCount = result.value.data?.totalLikes ?? 0;
|
||||
break;
|
||||
case Error<int>():
|
||||
case Error<FeedbackStatResponse>():
|
||||
userLikedTendersCount = 0;
|
||||
break;
|
||||
}
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> loadSubmissionStats() async {
|
||||
final result = await _homeRepository.getSubmissionStats();
|
||||
switch (result) {
|
||||
case Ok<TenderSubmissionStatsResponse>():
|
||||
tenderSubmissionStats = result.value.data;
|
||||
break;
|
||||
case Error<TenderSubmissionStatsResponse>():
|
||||
tenderSubmissionStats = null;
|
||||
break;
|
||||
}
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
int get approvedTendersCount =>
|
||||
tenderApprovalsStateResponse?.data?.submittedTenders ?? 0;
|
||||
|
||||
int get submittedTendersCount =>
|
||||
tenderSubmissionStats?.byStage['submitted'] ?? 0;
|
||||
|
||||
double get partnershipCount {
|
||||
return tenderApprovalsStateResponse?.data?.partnershipCount?.toDouble() ??
|
||||
0.0;
|
||||
|
||||
@@ -87,7 +87,7 @@ class NotificationViewModel with ChangeNotifier {
|
||||
}
|
||||
notifyListeners();
|
||||
|
||||
final int offset = page * _pageSize;
|
||||
final int offset = (page - 1) * _pageSize;
|
||||
|
||||
final result = await _repository.getNotifications(
|
||||
limit: _pageSize,
|
||||
@@ -138,7 +138,7 @@ class NotificationViewModel with ChangeNotifier {
|
||||
}
|
||||
notifyListeners();
|
||||
|
||||
final int offset = page * _pageSize;
|
||||
final int offset = (page - 1) * _pageSize;
|
||||
final result = await _repository.getUnreadNotifications(
|
||||
limit: _pageSize,
|
||||
offset: offset,
|
||||
@@ -181,7 +181,7 @@ class NotificationViewModel with ChangeNotifier {
|
||||
}
|
||||
notifyListeners();
|
||||
|
||||
final int offset = page * _pageSize;
|
||||
final int offset = (page - 1) * _pageSize;
|
||||
|
||||
final result = await _repository.getImportantNotifications(
|
||||
limit: _pageSize,
|
||||
|
||||
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:tm_app/core/utils/device_utils.dart';
|
||||
import 'package:tm_app/core/utils/logger.dart';
|
||||
import 'package:tm_app/core/network/app_exceptions.dart';
|
||||
import 'package:tm_app/data/repositories/tenders_repository.dart';
|
||||
import 'package:tm_app/data/services/model/feedback_data/feedback_data.dart';
|
||||
import 'package:tm_app/data/services/model/feedback_response/feedback_response.dart';
|
||||
@@ -36,6 +37,12 @@ class TendersViewModel with ChangeNotifier {
|
||||
String? get searchQuery => _searchQuery;
|
||||
|
||||
List<FeedbackData> feedbacks = [];
|
||||
final Set<String> _hydratedFeedbackTenderIds = <String>{};
|
||||
final Set<String> _feedbackHydrationsInFlight = <String>{};
|
||||
final Set<String> _feedbackRequestsInFlight = <String>{};
|
||||
|
||||
bool isFeedbackLoading(String tenderId) =>
|
||||
_feedbackRequestsInFlight.contains(tenderId);
|
||||
|
||||
static const int _pageSize = 10;
|
||||
|
||||
@@ -207,8 +214,7 @@ class TendersViewModel with ChangeNotifier {
|
||||
_currentOffset = meta!.offset!;
|
||||
}
|
||||
final tenders = _tendersResponse?.data?.tenders ?? [];
|
||||
_hasMoreData =
|
||||
meta?.hasMore ?? (tenders.length >= _pageSize);
|
||||
_hasMoreData = meta?.hasMore ?? (tenders.length >= _pageSize);
|
||||
if (tenders.isNotEmpty) {
|
||||
if (fetchAllFeedbacks) {
|
||||
for (final tender in tenders) {
|
||||
@@ -263,8 +269,13 @@ class TendersViewModel with ChangeNotifier {
|
||||
data: result.value.data?.copyWith(tenders: combined),
|
||||
);
|
||||
final newMeta = result.value.meta;
|
||||
_hasMoreData =
|
||||
newMeta?.hasMore ?? (newTenders.length >= _pageSize);
|
||||
_hasMoreData = newMeta?.hasMore ?? (newTenders.length >= _pageSize);
|
||||
for (final tender in newTenders) {
|
||||
final id = tender.id;
|
||||
if (id != null && !_hydratedFeedbackTenderIds.contains(id)) {
|
||||
getTenderFeedback(id);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
_hasMoreData = false;
|
||||
}
|
||||
@@ -283,14 +294,18 @@ class TendersViewModel with ChangeNotifier {
|
||||
}
|
||||
|
||||
Future<void> getTenderFeedback(String tenderId) async {
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
if (_hydratedFeedbackTenderIds.contains(tenderId) ||
|
||||
_feedbackHydrationsInFlight.contains(tenderId)) {
|
||||
return;
|
||||
}
|
||||
_feedbackHydrationsInFlight.add(tenderId);
|
||||
|
||||
final result = await _tendersRepository.getTenderFeedback(
|
||||
tenderId: tenderId,
|
||||
);
|
||||
switch (result) {
|
||||
case Ok<FeedbackResponse>():
|
||||
_hydratedFeedbackTenderIds.add(tenderId);
|
||||
_feedbackData = result.value.data;
|
||||
if (_feedbackData != null) {
|
||||
final index = feedbacks.indexWhere(
|
||||
@@ -311,19 +326,33 @@ class TendersViewModel with ChangeNotifier {
|
||||
}
|
||||
break;
|
||||
case Error<FeedbackResponse>():
|
||||
_errorMessage = result.error.toString();
|
||||
if (result.error is NotFoundException) {
|
||||
// A 404 is the expected representation of neutral feedback state.
|
||||
feedbacks.removeWhere((feedback) => feedback.tenderId == tenderId);
|
||||
_hydratedFeedbackTenderIds.add(tenderId);
|
||||
} else {
|
||||
_feedbackErrorMessage = result.error.toString();
|
||||
}
|
||||
break;
|
||||
}
|
||||
_feedbackHydrationsInFlight.remove(tenderId);
|
||||
notifyListeners();
|
||||
_errorMessage = null;
|
||||
if (_feedbackErrorMessage != null) {
|
||||
_feedbackErrorMessage = null;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> toogleFeedback({
|
||||
Future<void> toggleFeedback({
|
||||
required String tenderId,
|
||||
required String feedbackType,
|
||||
}) async {
|
||||
if (_feedbackRequestsInFlight.contains(tenderId)) {
|
||||
return;
|
||||
}
|
||||
|
||||
_feedbackErrorMessage = null;
|
||||
_feedbackRequestsInFlight.add(tenderId);
|
||||
|
||||
final existingFeedback = getFeedbackForTender(tenderId);
|
||||
final existingFeedbackIndex = feedbacks.indexWhere(
|
||||
@@ -335,13 +364,13 @@ class TendersViewModel with ChangeNotifier {
|
||||
if (existingFeedback == null) {
|
||||
optimisticFeedback = FeedbackData(
|
||||
companyId: null,
|
||||
createdAt: DateTime.now().millisecondsSinceEpoch,
|
||||
createdAt: DateTime.now().millisecondsSinceEpoch ~/ 1000,
|
||||
customerId: null,
|
||||
feedbackType: feedbackType,
|
||||
id: null,
|
||||
tenderId: tenderId,
|
||||
tender: null,
|
||||
updatedAt: DateTime.now().millisecondsSinceEpoch,
|
||||
updatedAt: DateTime.now().millisecondsSinceEpoch ~/ 1000,
|
||||
);
|
||||
feedbacks.add(optimisticFeedback);
|
||||
} else {
|
||||
@@ -353,7 +382,7 @@ class TendersViewModel with ChangeNotifier {
|
||||
} else {
|
||||
optimisticFeedback = existingFeedback.copyWith(
|
||||
feedbackType: feedbackType,
|
||||
updatedAt: DateTime.now().millisecondsSinceEpoch,
|
||||
updatedAt: DateTime.now().millisecondsSinceEpoch ~/ 1000,
|
||||
);
|
||||
if (existingFeedbackIndex != -1) {
|
||||
feedbacks[existingFeedbackIndex] = optimisticFeedback;
|
||||
@@ -371,9 +400,13 @@ class TendersViewModel with ChangeNotifier {
|
||||
switch (result) {
|
||||
case Ok<FeedbackResponse>():
|
||||
_feedbackData = result.value.data;
|
||||
if (_feedbackData != null) {
|
||||
final responseType = _feedbackData?.feedbackType;
|
||||
if (responseType == 'unlike' || responseType == 'undislike') {
|
||||
feedbacks.removeWhere((feedback) => feedback.tenderId == tenderId);
|
||||
_feedbackData = null;
|
||||
} else if (_feedbackData != null) {
|
||||
final index = feedbacks.indexWhere(
|
||||
(f) => f.tender == _feedbackData!.tender,
|
||||
(feedback) => feedback.tenderId == tenderId,
|
||||
);
|
||||
if (index != -1) {
|
||||
feedbacks[index] = _feedbackData!;
|
||||
@@ -383,6 +416,7 @@ class TendersViewModel with ChangeNotifier {
|
||||
} else {
|
||||
feedbacks.removeWhere((f) => f.tenderId == tenderId);
|
||||
}
|
||||
_hydratedFeedbackTenderIds.add(tenderId);
|
||||
break;
|
||||
case Error<FeedbackResponse>():
|
||||
if (existingFeedback == null) {
|
||||
@@ -401,13 +435,24 @@ class TendersViewModel with ChangeNotifier {
|
||||
break;
|
||||
}
|
||||
|
||||
_feedbackRequestsInFlight.remove(tenderId);
|
||||
notifyListeners();
|
||||
_feedbackErrorMessage = null;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Kept temporarily for callers compiled against the old misspelled API.
|
||||
@Deprecated('Use toggleFeedback')
|
||||
Future<void> toogleFeedback({
|
||||
required String tenderId,
|
||||
required String feedbackType,
|
||||
}) => toggleFeedback(tenderId: tenderId, feedbackType: feedbackType);
|
||||
|
||||
void clearFeedbacks() {
|
||||
feedbacks.clear();
|
||||
_hydratedFeedbackTenderIds.clear();
|
||||
_feedbackHydrationsInFlight.clear();
|
||||
_feedbackRequestsInFlight.clear();
|
||||
_feedbackData = null;
|
||||
_feedbackErrorMessage = null;
|
||||
notifyListeners();
|
||||
|
||||
@@ -3,9 +3,11 @@ import 'package:intl/intl.dart';
|
||||
import 'package:tm_app/core/theme/colors.dart';
|
||||
import 'package:tm_app/core/utils/error_utils.dart';
|
||||
import 'package:tm_app/core/utils/result.dart';
|
||||
import 'package:tm_app/core/network/app_exceptions.dart';
|
||||
import 'package:tm_app/data/repositories/your_tenders_repository.dart';
|
||||
import 'package:tm_app/data/services/model/liked_tenders_response/liked_tenders_response.dart';
|
||||
import 'package:tm_app/data/services/model/tender_approvals_response/tender_approvals_response.dart';
|
||||
import 'package:tm_app/data/services/model/tender_submission/tender_submission.dart';
|
||||
import 'package:tm_app/views/your_tenders/strings/your_tenders_strings.dart';
|
||||
|
||||
import '../core/constants/assets.dart';
|
||||
@@ -22,6 +24,21 @@ class YourTendersViewModel with ChangeNotifier {
|
||||
String? errorMessage;
|
||||
TenderApprovalsResponse? data;
|
||||
LikedTendersResponse? likedTendersData;
|
||||
TenderSubmissionsResponse? submissionsData;
|
||||
TenderSubmissionStats? submissionStats;
|
||||
String selectedSubmissionStage = 'opportunity';
|
||||
String? updatingSubmissionId;
|
||||
String? submissionActionError;
|
||||
|
||||
bool get isSubmissionWorkflow =>
|
||||
selectedStatus == TenderApprovalStatus.submitted.value;
|
||||
|
||||
static const submissionStages = <String>[
|
||||
'opportunity',
|
||||
'in_progress',
|
||||
'submitted',
|
||||
'not_applied',
|
||||
];
|
||||
|
||||
// Pagination state for feedback lists
|
||||
bool isLoadingMore = false;
|
||||
@@ -247,6 +264,8 @@ class YourTendersViewModel with ChangeNotifier {
|
||||
// Clear main data
|
||||
data = null;
|
||||
likedTendersData = null;
|
||||
submissionsData = null;
|
||||
submissionStats = null;
|
||||
|
||||
// Clear loading states
|
||||
isLoading = false;
|
||||
@@ -269,6 +288,7 @@ class YourTendersViewModel with ChangeNotifier {
|
||||
Future<void> callWithFilter() async {
|
||||
likedTendersData = null;
|
||||
data = null;
|
||||
submissionsData = null;
|
||||
isLoading = true;
|
||||
notifyListeners();
|
||||
|
||||
@@ -282,14 +302,8 @@ class YourTendersViewModel with ChangeNotifier {
|
||||
);
|
||||
await getTenders(requestModel: requestModel, reset: true);
|
||||
} else if (selectedStatus == TenderApprovalStatus.submitted.value) {
|
||||
final requestModel = GetTendersRequestModel(
|
||||
status: TenderApprovalStatus.submitted.value,
|
||||
createdFrom: startDateUnix,
|
||||
createdTo: endDateUnix,
|
||||
limit: _tendersLimit,
|
||||
offset: _tendersOffset,
|
||||
);
|
||||
await getTenders(requestModel: requestModel, reset: true);
|
||||
selectedSubmissionStage = 'submitted';
|
||||
await loadSubmissions();
|
||||
} else if (selectedStatus == TenderFeedback.liked.value) {
|
||||
await getTendersFeedback(
|
||||
feedbackType: TenderFeedback.liked.value,
|
||||
@@ -318,6 +332,11 @@ class YourTendersViewModel with ChangeNotifier {
|
||||
int currentPage = 1;
|
||||
|
||||
int get totalPages {
|
||||
if (isSubmissionWorkflow && submissionsData?.meta != null) {
|
||||
return submissionsData!.meta!.pages == 0
|
||||
? 1
|
||||
: submissionsData!.meta!.pages;
|
||||
}
|
||||
if (likedTendersData?.data?.meta?.pages != null) {
|
||||
return likedTendersData!.data!.meta!.pages!;
|
||||
}
|
||||
@@ -329,6 +348,10 @@ class YourTendersViewModel with ChangeNotifier {
|
||||
|
||||
Future<void> jumpToPage(int page) async {
|
||||
currentPage = page;
|
||||
if (isSubmissionWorkflow) {
|
||||
await loadSubmissions(offset: (page - 1) * 20);
|
||||
return;
|
||||
}
|
||||
_offset = (page - 1) * _limit;
|
||||
_tendersOffset = (page - 1) * _tendersLimit;
|
||||
|
||||
@@ -340,6 +363,94 @@ class YourTendersViewModel with ChangeNotifier {
|
||||
await callWithFilter();
|
||||
}
|
||||
|
||||
Future<void> selectSubmissionStage(String stage) async {
|
||||
if (!submissionStages.contains(stage) || stage == selectedSubmissionStage) {
|
||||
return;
|
||||
}
|
||||
selectedSubmissionStage = stage;
|
||||
submissionActionError = null;
|
||||
currentPage = 1;
|
||||
notifyListeners();
|
||||
await loadSubmissions();
|
||||
}
|
||||
|
||||
Future<void> loadSubmissions({int offset = 0}) async {
|
||||
isLoading = true;
|
||||
errorMessage = null;
|
||||
notifyListeners();
|
||||
|
||||
final result = await yourTendersRepository.getSubmissions(
|
||||
stage: selectedSubmissionStage,
|
||||
limit: 20,
|
||||
offset: offset,
|
||||
);
|
||||
switch (result) {
|
||||
case Ok<TenderSubmissionsResponse>():
|
||||
submissionsData = result.value;
|
||||
currentPage = result.value.meta?.page ?? 1;
|
||||
case Error<TenderSubmissionsResponse>():
|
||||
errorMessage = ErrorUtils.getErrorMessage(result.error);
|
||||
}
|
||||
|
||||
final statsResult = await yourTendersRepository.getSubmissionStats();
|
||||
switch (statsResult) {
|
||||
case Ok<TenderSubmissionStatsResponse>():
|
||||
submissionStats = statsResult.value.data;
|
||||
case Error<TenderSubmissionStatsResponse>():
|
||||
// The list remains useful when stats are temporarily unavailable.
|
||||
break;
|
||||
}
|
||||
|
||||
isLoading = false;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<bool> updateSubmissionStatus({
|
||||
required TenderSubmission submission,
|
||||
required String status,
|
||||
String? reason,
|
||||
String? description,
|
||||
}) async {
|
||||
if (submission.id.isEmpty || submission.isTerminal) {
|
||||
return false;
|
||||
}
|
||||
|
||||
updatingSubmissionId = submission.id;
|
||||
submissionActionError = null;
|
||||
notifyListeners();
|
||||
final result = await yourTendersRepository.updateSubmissionStatus(
|
||||
id: submission.id,
|
||||
status: status,
|
||||
reason: reason,
|
||||
description: description,
|
||||
);
|
||||
|
||||
switch (result) {
|
||||
case Ok<TenderSubmissionResponse>():
|
||||
updatingSubmissionId = null;
|
||||
await loadSubmissions();
|
||||
return true;
|
||||
case Error<TenderSubmissionResponse>():
|
||||
updatingSubmissionId = null;
|
||||
if (result.error is AppException &&
|
||||
(result.error as AppException).statusCode == 409) {
|
||||
await loadSubmissions();
|
||||
submissionActionError =
|
||||
'This submission changed elsewhere. The latest state has been loaded; please try again.';
|
||||
notifyListeners();
|
||||
return false;
|
||||
}
|
||||
submissionActionError = ErrorUtils.getErrorMessage(result.error);
|
||||
notifyListeners();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
void dismissSubmissionActionError() {
|
||||
submissionActionError = null;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Color getBackGroundColorByStatus(String status) {
|
||||
if (status == TenderFeedback.liked.value ||
|
||||
status == TenderApprovalStatus.submitted.value) {
|
||||
|
||||
@@ -301,7 +301,7 @@ class _TaskCard extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
if (due != null) const SizedBox(height: 12),
|
||||
Text(
|
||||
SelectableText(
|
||||
card.title ?? '',
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
@@ -309,7 +309,6 @@ class _TaskCard extends StatelessWidget {
|
||||
color: AppColors.grey70,
|
||||
),
|
||||
maxLines: 3,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
if (card.priority != null) _PriorityChip(priority: card.priority!),
|
||||
|
||||
@@ -141,7 +141,7 @@ class TenderDetailHeader extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
|
||||
Widget _titleText() => Text(
|
||||
Widget _titleText() => SelectableText(
|
||||
detail.title ?? '',
|
||||
style: TextStyle(
|
||||
color: AppColors.grey80,
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:tm_app/core/constants/assets.dart';
|
||||
import 'package:tm_app/core/routes/app_routes.dart';
|
||||
@@ -67,7 +68,7 @@ class DesktopHomePage extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
SizedBox(height: 32.0.h()),
|
||||
_yourTenderText(homeViewModel),
|
||||
_yourTenderText(context, homeViewModel),
|
||||
SizedBox(height: 8.0.h()),
|
||||
_bottomListView(homeViewModel),
|
||||
],
|
||||
@@ -126,13 +127,7 @@ class DesktopHomePage extends StatelessWidget {
|
||||
backgroundColor: AppColors.primary20,
|
||||
iconPath: AssetsManager.arrows,
|
||||
title: HomeStrings.tenderSubmitted,
|
||||
amount:
|
||||
(homeViewModel
|
||||
.tenderApprovalsStateResponse
|
||||
?.data
|
||||
?.submittedTenders ??
|
||||
0)
|
||||
.toString(),
|
||||
amount: homeViewModel.submittedTendersCount.toString(),
|
||||
|
||||
textColor: AppColors.mainBlue,
|
||||
enableTap: true,
|
||||
@@ -151,7 +146,7 @@ class DesktopHomePage extends StatelessWidget {
|
||||
backgroundColor: AppColors.primary10,
|
||||
iconPath: AssetsManager.approve,
|
||||
title: HomeStrings.approvedTenders,
|
||||
amount: '0',
|
||||
amount: homeViewModel.approvedTendersCount.toString(),
|
||||
textColor: AppColors.jellyBean,
|
||||
enableTap: true,
|
||||
width: 178,
|
||||
@@ -164,19 +159,8 @@ class DesktopHomePage extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
TenderCard(
|
||||
backgroundColor: AppColors.orange10,
|
||||
iconPath: AssetsManager.shield,
|
||||
title: HomeStrings.tenderValue,
|
||||
amount: '0',
|
||||
textColor: AppColors.orange,
|
||||
enableTap: true,
|
||||
width: 178,
|
||||
height: 148,
|
||||
onTap: () {},
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
TenderCard(
|
||||
Expanded(
|
||||
child: TenderCard(
|
||||
backgroundColor: AppColors.grey10,
|
||||
iconPath: AssetsManager.thumbLike,
|
||||
title: HomeStrings.likedTenders,
|
||||
@@ -191,17 +175,24 @@ class DesktopHomePage extends StatelessWidget {
|
||||
});
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
Widget _yourTenderText(HomeViewModel homeViewModel) {
|
||||
Widget _yourTenderText(BuildContext context, HomeViewModel homeViewModel) {
|
||||
final isYourTenders =
|
||||
(homeViewModel.data?.data?.tenders?.isNotEmpty ?? false);
|
||||
return ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 740),
|
||||
child: Align(
|
||||
alignment: AlignmentDirectional.centerStart,
|
||||
child: GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTap:
|
||||
isYourTenders
|
||||
? null
|
||||
: () => context.go('/tenders?tab=recommended'),
|
||||
child: Text(
|
||||
isYourTenders
|
||||
? HomeStrings.yourTenders
|
||||
@@ -213,6 +204,7 @@ class DesktopHomePage extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:tm_app/core/constants/assets.dart';
|
||||
import 'package:tm_app/core/routes/app_routes.dart';
|
||||
import 'package:tm_app/core/theme/colors.dart';
|
||||
import 'package:tm_app/core/utils/size_config.dart';
|
||||
import 'package:tm_app/data/services/model/tender_approvals_stats_response/tender_approvals_stats_response.dart';
|
||||
import 'package:tm_app/view_models/home_view_model.dart';
|
||||
import 'package:tm_app/views/shared/tender_app_bar.dart';
|
||||
|
||||
@@ -43,14 +43,11 @@ class MobileHomePage extends StatelessWidget {
|
||||
SizedBox(height: 32.0.h()),
|
||||
_progressBarsRow(homeViewModel),
|
||||
SizedBox(height: 32.0.h()),
|
||||
_firstTenderCardsRow(
|
||||
context,
|
||||
homeViewModel.tenderApprovalsStateResponse!,
|
||||
),
|
||||
_firstTenderCardsRow(context, homeViewModel),
|
||||
SizedBox(height: 8.0.h()),
|
||||
_secondTenderCardsRow(homeViewModel, context),
|
||||
SizedBox(height: 40.0.h()),
|
||||
_yourTenderText(homeViewModel),
|
||||
_yourTenderText(context, homeViewModel),
|
||||
_bottomListView(homeViewModel),
|
||||
],
|
||||
),
|
||||
@@ -92,7 +89,7 @@ class MobileHomePage extends StatelessWidget {
|
||||
|
||||
Widget _firstTenderCardsRow(
|
||||
BuildContext context,
|
||||
TenderApprovalsStatsResponse tenderApprovalsStateResponse,
|
||||
HomeViewModel homeViewModel,
|
||||
) {
|
||||
return Padding(
|
||||
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
|
||||
@@ -103,9 +100,7 @@ class MobileHomePage extends StatelessWidget {
|
||||
backgroundColor: AppColors.primary20,
|
||||
iconPath: AssetsManager.arrows,
|
||||
title: HomeStrings.tenderSubmitted,
|
||||
amount:
|
||||
(tenderApprovalsStateResponse.data?.submittedTenders ?? 0)
|
||||
.toString(),
|
||||
amount: homeViewModel.submittedTendersCount.toString(),
|
||||
textColor: AppColors.mainBlue,
|
||||
enableTap: true,
|
||||
onTap: () {
|
||||
@@ -118,7 +113,7 @@ class MobileHomePage extends StatelessWidget {
|
||||
backgroundColor: AppColors.primary10,
|
||||
iconPath: AssetsManager.approve,
|
||||
title: HomeStrings.approvedTenders,
|
||||
amount: '0',
|
||||
amount: homeViewModel.approvedTendersCount.toString(),
|
||||
|
||||
textColor: AppColors.jellyBean,
|
||||
enableTap: true,
|
||||
@@ -142,38 +137,36 @@ class MobileHomePage extends StatelessWidget {
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
TenderCard(
|
||||
backgroundColor: AppColors.orange10,
|
||||
iconPath: AssetsManager.shield,
|
||||
title: HomeStrings.tenderValue,
|
||||
amount: '0',
|
||||
textColor: AppColors.orange,
|
||||
enableTap: true,
|
||||
onTap: () {},
|
||||
),
|
||||
TenderCard(
|
||||
Expanded(
|
||||
child: TenderCard(
|
||||
backgroundColor: AppColors.grey10,
|
||||
iconPath: AssetsManager.thumbLike,
|
||||
title: HomeStrings.likedTenders,
|
||||
amount: homeViewModel.userLikedTendersCount.toString(),
|
||||
textColor: AppColors.grey50,
|
||||
enableTap: true,
|
||||
width: double.infinity,
|
||||
onTap: () {
|
||||
const LikedTendersRouteData().push(context).then((value) {
|
||||
homeViewModel.init();
|
||||
});
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _yourTenderText(HomeViewModel homeViewModel) {
|
||||
Widget _yourTenderText(BuildContext context, HomeViewModel homeViewModel) {
|
||||
final isYourTenders =
|
||||
(homeViewModel.data?.data?.tenders?.isNotEmpty ?? false);
|
||||
return Padding(
|
||||
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
|
||||
child: GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTap:
|
||||
isYourTenders ? null : () => context.go('/tenders?tab=recommended'),
|
||||
child: Text(
|
||||
isYourTenders
|
||||
? HomeStrings.yourTenders
|
||||
@@ -184,6 +177,7 @@ class MobileHomePage extends StatelessWidget {
|
||||
color: AppColors.grey80,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:tm_app/core/routes/app_routes.dart';
|
||||
import 'package:tm_app/core/theme/colors.dart';
|
||||
import 'package:tm_app/core/utils/size_config.dart';
|
||||
import 'package:tm_app/data/services/model/tender_approvals_stats_response/tender_approvals_stats_response.dart';
|
||||
import 'package:tm_app/view_models/home_view_model.dart';
|
||||
import 'package:tm_app/views/shared/tablet_navigation_widget.dart';
|
||||
|
||||
@@ -58,14 +58,11 @@ class TabletHomePage extends StatelessWidget {
|
||||
SizedBox(height: 40.0.h()),
|
||||
_progressBarsRow(homeViewModel),
|
||||
SizedBox(height: 32.0.h()),
|
||||
_firstTenderCardsRow(
|
||||
context,
|
||||
homeViewModel.tenderApprovalsStateResponse!,
|
||||
),
|
||||
_firstTenderCardsRow(context, homeViewModel),
|
||||
SizedBox(height: 8.0.h()),
|
||||
_secondTenderCardsRow(homeViewModel, context),
|
||||
SizedBox(height: 32.0.h()),
|
||||
_yourTenderText(homeViewModel),
|
||||
_yourTenderText(context, homeViewModel),
|
||||
SizedBox(height: 8.0.h()),
|
||||
_bottomListView(homeViewModel),
|
||||
],
|
||||
@@ -112,7 +109,7 @@ class TabletHomePage extends StatelessWidget {
|
||||
|
||||
Widget _firstTenderCardsRow(
|
||||
BuildContext context,
|
||||
TenderApprovalsStatsResponse tenderApprovalsStateResponse,
|
||||
HomeViewModel homeViewModel,
|
||||
) {
|
||||
return Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
@@ -122,9 +119,7 @@ class TabletHomePage extends StatelessWidget {
|
||||
backgroundColor: AppColors.primary20,
|
||||
iconPath: AssetsManager.arrows,
|
||||
title: HomeStrings.tenderSubmitted,
|
||||
amount:
|
||||
(tenderApprovalsStateResponse.data?.submittedTenders ?? 0)
|
||||
.toString(),
|
||||
amount: homeViewModel.submittedTendersCount.toString(),
|
||||
|
||||
textColor: AppColors.mainBlue,
|
||||
enableTap: true,
|
||||
@@ -143,7 +138,7 @@ class TabletHomePage extends StatelessWidget {
|
||||
backgroundColor: AppColors.primary10,
|
||||
iconPath: AssetsManager.approve,
|
||||
title: HomeStrings.approvedTenders,
|
||||
amount: '0',
|
||||
amount: homeViewModel.approvedTendersCount.toString(),
|
||||
textColor: AppColors.jellyBean,
|
||||
enableTap: true,
|
||||
width: double.infinity,
|
||||
@@ -166,20 +161,6 @@ class TabletHomePage extends StatelessWidget {
|
||||
return Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Expanded(
|
||||
child: TenderCard(
|
||||
backgroundColor: AppColors.orange10,
|
||||
iconPath: AssetsManager.shield,
|
||||
title: HomeStrings.tenderValue,
|
||||
amount: '0',
|
||||
textColor: AppColors.orange,
|
||||
enableTap: true,
|
||||
width: double.infinity,
|
||||
height: 148,
|
||||
onTap: () {},
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 16.0),
|
||||
Expanded(
|
||||
child: TenderCard(
|
||||
backgroundColor: AppColors.grey10,
|
||||
@@ -201,16 +182,23 @@ class TabletHomePage extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
|
||||
Widget _yourTenderText(HomeViewModel homeViewModel) {
|
||||
Widget _yourTenderText(BuildContext context, HomeViewModel homeViewModel) {
|
||||
final isYourTenders =
|
||||
(homeViewModel.data?.data?.tenders?.isNotEmpty ?? false);
|
||||
return Text(
|
||||
isYourTenders ? HomeStrings.yourTenders : HomeStrings.recommendedTenders,
|
||||
return GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTap:
|
||||
isYourTenders ? null : () => context.go('/tenders?tab=recommended'),
|
||||
child: Text(
|
||||
isYourTenders
|
||||
? HomeStrings.yourTenders
|
||||
: HomeStrings.recommendedTenders,
|
||||
style: TextStyle(
|
||||
fontSize: 18.0.sp(),
|
||||
fontWeight: FontWeight.w700,
|
||||
color: AppColors.grey80,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -5,11 +5,11 @@ class HomeStrings {
|
||||
static const String partnership = 'Partnership';
|
||||
static const String selfApply = 'Self-apply';
|
||||
static const String contracting = 'Contracting';
|
||||
static const String tenderSubmitted = 'Tenders submitted';
|
||||
static const String tenderSubmitted = 'Submitted tenders';
|
||||
static const String approvedTenders = 'Approved tenders';
|
||||
static const String tenderValue = 'Tender Value';
|
||||
static const String thunderStatus = 'Thunder status';
|
||||
static const String likedTenders = 'Liked Tenders';
|
||||
static const String likedTenders = 'Liked tenders';
|
||||
static const String yourTenders = 'Your tenders';
|
||||
static const String recommendation = 'Recommendation';
|
||||
static const String welcome = 'Welcome';
|
||||
|
||||
@@ -75,10 +75,10 @@ class TendersListItem extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
SizedBox(height: 12.0.h()),
|
||||
Text(
|
||||
SelectableText(
|
||||
tender.title ?? '',
|
||||
maxLines: 2,
|
||||
style: TextStyle(
|
||||
overflow: TextOverflow.ellipsis,
|
||||
fontSize: 16.0.sp(),
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.grey80,
|
||||
|
||||
@@ -128,10 +128,10 @@ class LikedListItem extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
SizedBox(height: 12.0.h()),
|
||||
Text(
|
||||
SelectableText(
|
||||
tender.title!,
|
||||
maxLines: 2,
|
||||
style: TextStyle(
|
||||
overflow: TextOverflow.ellipsis,
|
||||
fontSize: 16.0.sp(),
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.grey80,
|
||||
|
||||
@@ -75,6 +75,35 @@ class NotificationMoreDialog extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
),
|
||||
Visibility(
|
||||
visible: notification.link != null && notification.link != '',
|
||||
child: Padding(
|
||||
padding: EdgeInsets.only(left: 28.0.w(), top: 8.0.h()),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Icon(
|
||||
Icons.link,
|
||||
size: 16.0.sp(),
|
||||
color: AppColors.mainBlue,
|
||||
),
|
||||
SizedBox(width: 4.0.w()),
|
||||
Expanded(
|
||||
child: SelectableText(
|
||||
notification.link ?? '',
|
||||
style: TextStyle(
|
||||
fontSize: 13.0.sp(),
|
||||
fontWeight: FontWeight.w400,
|
||||
color: AppColors.mainBlue,
|
||||
decoration: TextDecoration.underline,
|
||||
decorationColor: AppColors.mainBlue,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(height: 12.0.h()),
|
||||
Padding(
|
||||
padding: EdgeInsets.only(left: 28.0.w()),
|
||||
|
||||
@@ -1,27 +1,17 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:tm_app/core/constants/assets.dart';
|
||||
import 'package:tm_app/core/theme/colors.dart';
|
||||
import 'package:tm_app/core/utils/size_config.dart';
|
||||
import 'package:tm_app/view_models/tenders_view_model.dart';
|
||||
import 'package:tm_app/views/shared/base_button.dart';
|
||||
import 'package:tm_app/views/shared/desktop_navigation_widget.dart';
|
||||
import 'package:tm_app/views/tenders/strings/tenders_strings.dart';
|
||||
import 'package:tm_app/views/tenders/widgets/main_tenders_slider.dart';
|
||||
import 'package:tm_app/views/tenders/widgets/recommended_tenders_view.dart';
|
||||
import 'package:tm_app/views/tenders/widgets/tenders_filter_dialog.dart';
|
||||
import 'package:tm_app/views/tenders/widgets/tenders_sort_dialog.dart';
|
||||
import 'package:tm_app/views/tenders/widgets/tenders_tab_bar.dart';
|
||||
|
||||
import '../../../core/constants/common_strings.dart';
|
||||
import '../../../core/utils/app_toast.dart';
|
||||
import '../../../view_models/auth_view_model.dart';
|
||||
|
||||
class DesktopTendersPage extends StatefulWidget {
|
||||
const DesktopTendersPage({super.key});
|
||||
const DesktopTendersPage({required this.initialSelectedTab, super.key});
|
||||
|
||||
final int initialSelectedTab;
|
||||
|
||||
@override
|
||||
State<DesktopTendersPage> createState() => _DesktopTendersPageState();
|
||||
@@ -30,9 +20,6 @@ class DesktopTendersPage extends StatefulWidget {
|
||||
class _DesktopTendersPageState extends State<DesktopTendersPage> {
|
||||
late final TendersViewModel viewModel;
|
||||
|
||||
/// 0 = All, 1 = Recommended.
|
||||
int _selectedTab = 0;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
@@ -54,8 +41,6 @@ class _DesktopTendersPageState extends State<DesktopTendersPage> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final userRole = context.watch<AuthViewModel>().userRole;
|
||||
final bool isAllTab = _selectedTab == 0;
|
||||
return Scaffold(
|
||||
backgroundColor: AppColors.backgroundColor,
|
||||
body: SafeArea(
|
||||
@@ -63,24 +48,23 @@ class _DesktopTendersPageState extends State<DesktopTendersPage> {
|
||||
children: [
|
||||
const DesktopNavigationWidget(currentIndex: 1),
|
||||
SizedBox(height: 24.0.h()),
|
||||
SizedBox(
|
||||
width: 740,
|
||||
child: TendersTabBar(
|
||||
selectedIndex: _selectedTab,
|
||||
onChanged: (index) => setState(() => _selectedTab = index),
|
||||
),
|
||||
),
|
||||
SizedBox(height: 24.0.h()),
|
||||
if (isAllTab && userRole == Role.analyst) const _SearchBox(),
|
||||
if (isAllTab && userRole == Role.analyst) const _ActionButtons(),
|
||||
Expanded(
|
||||
child:
|
||||
isAllTab
|
||||
? const _AllTendersTab()
|
||||
: const Center(
|
||||
// Tab bar hidden while tenders only shows recommendations.
|
||||
// SizedBox(
|
||||
// width: 740,
|
||||
// child: TendersTabBar(
|
||||
// selectedIndex: 1,
|
||||
// onChanged: (index) {},
|
||||
// ),
|
||||
// ),
|
||||
// SizedBox(height: 24.0.h()),
|
||||
// All tenders controls are hidden while the All tab is disabled.
|
||||
// if (userRole == Role.analyst) const _SearchBox(),
|
||||
// if (userRole == Role.analyst) const _ActionButtons(),
|
||||
const Expanded(
|
||||
child: Center(
|
||||
child: SizedBox(
|
||||
width: 740,
|
||||
child: RecommendedTendersView(),
|
||||
child: RecommendedTendersView(isDesktop: true),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -90,190 +74,3 @@ class _DesktopTendersPageState extends State<DesktopTendersPage> {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _AllTendersTab extends StatelessWidget {
|
||||
const _AllTendersTab();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Consumer<TendersViewModel>(
|
||||
builder: (context, vm, child) {
|
||||
if (vm.isLoading) {
|
||||
return const Center(
|
||||
child: CircularProgressIndicator(color: AppColors.jellyBean),
|
||||
);
|
||||
}
|
||||
if (vm.errorMessage != null) {
|
||||
return Center(child: Text(vm.errorMessage!));
|
||||
}
|
||||
final tenders = vm.tendersResponse?.data?.tenders ?? [];
|
||||
if (tenders.isEmpty) {
|
||||
return const Center(child: Text(CommonStrings.noData));
|
||||
}
|
||||
|
||||
return Center(
|
||||
child: SizedBox(
|
||||
width: 740,
|
||||
child: Padding(
|
||||
padding: EdgeInsets.symmetric(vertical: 4.0.h()),
|
||||
child: MainTendersSlider(tenders: tenders, isDesktop: true),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _SearchBox extends StatefulWidget {
|
||||
const _SearchBox();
|
||||
|
||||
@override
|
||||
State<_SearchBox> createState() => _SearchBoxState();
|
||||
}
|
||||
|
||||
class _SearchBoxState extends State<_SearchBox> {
|
||||
final TextEditingController _searchController = TextEditingController();
|
||||
Timer? _debounceTimer;
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_searchController.dispose();
|
||||
_debounceTimer?.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _onSearchChanged(String query) {
|
||||
_debounceTimer?.cancel();
|
||||
_debounceTimer = Timer(const Duration(milliseconds: 500), () {
|
||||
final viewModel = context.read<TendersViewModel>();
|
||||
viewModel.searchTenders(query);
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return SizedBox(
|
||||
height: 48.0.h(),
|
||||
width: 680,
|
||||
child: TextField(
|
||||
controller: _searchController,
|
||||
onChanged: _onSearchChanged,
|
||||
style: TextStyle(fontSize: 16.0.sp(), color: AppColors.grey60),
|
||||
decoration: InputDecoration(
|
||||
hintText: TendersStrings.search,
|
||||
hintStyle: TextStyle(fontSize: 16.0.sp(), color: AppColors.grey60),
|
||||
prefixIcon: Padding(
|
||||
padding: EdgeInsets.all(12.0.w()),
|
||||
child: SvgPicture.asset(
|
||||
AssetsManager.normalSearch,
|
||||
width: 24.0.w(),
|
||||
height: 24.0.h(),
|
||||
),
|
||||
),
|
||||
filled: true,
|
||||
fillColor: AppColors.grey0,
|
||||
contentPadding: EdgeInsets.symmetric(
|
||||
horizontal: 12.0.w(),
|
||||
vertical: 12.0.h(),
|
||||
),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12.0.w()),
|
||||
borderSide: const BorderSide(color: AppColors.mainBlue, width: 1),
|
||||
),
|
||||
enabledBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12.0.w()),
|
||||
borderSide: BorderSide(color: AppColors.grey40, width: 1),
|
||||
),
|
||||
focusedBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12.0.w()),
|
||||
borderSide: const BorderSide(color: AppColors.grey, width: 1.5),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _ActionButtons extends StatelessWidget {
|
||||
const _ActionButtons();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final viewModel = context.read<TendersViewModel>();
|
||||
return Container(
|
||||
margin: EdgeInsets.only(top: 25.0.h()),
|
||||
height: 40.0.h(),
|
||||
width: 680,
|
||||
child: Row(
|
||||
children: [
|
||||
BaseButton(
|
||||
width: 178.0.w(),
|
||||
isEnabled: true,
|
||||
onPressed: () {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder:
|
||||
(_) => Dialog(
|
||||
backgroundColor: AppColors.backgroundColor,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
),
|
||||
child: SizedBox(
|
||||
width: 560,
|
||||
child: TendersFilterDialog(
|
||||
viewModel: viewModel,
|
||||
onFilterChanged: (dateRange, status) {
|
||||
viewModel.setDateRange(dateRange);
|
||||
viewModel.setStatus(status!);
|
||||
viewModel.callWithSortAndStatus();
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
text: TendersStrings.filter,
|
||||
icon: AssetsManager.filter,
|
||||
iconColor: AppColors.textBlue,
|
||||
backgroundColor: AppColors.primary20,
|
||||
textColor: AppColors.textBlue,
|
||||
),
|
||||
SizedBox(width: 10.0.w()),
|
||||
BaseButton(
|
||||
width: 178.0.w(),
|
||||
isEnabled: true,
|
||||
onPressed: () {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder:
|
||||
(_) => Dialog(
|
||||
backgroundColor: AppColors.backgroundColor,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
),
|
||||
child: SizedBox(
|
||||
width: 560,
|
||||
child: TendersSortDialog(
|
||||
viewModel: viewModel,
|
||||
onConfirm: (sort) {
|
||||
viewModel.setSort(sort);
|
||||
viewModel.callWithSortAndStatus();
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
text: TendersStrings.sort,
|
||||
icon: AssetsManager.sort,
|
||||
iconColor: AppColors.textBlue,
|
||||
backgroundColor: AppColors.primary20,
|
||||
textColor: AppColors.textBlue,
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,19 +1,17 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:tm_app/core/utils/size_config.dart';
|
||||
import 'package:tm_app/view_models/tenders_view_model.dart';
|
||||
|
||||
import '../../../core/constants/common_strings.dart';
|
||||
import '../../../core/theme/colors.dart';
|
||||
import '../../../core/utils/app_toast.dart';
|
||||
import '../../shared/tender_app_bar.dart';
|
||||
import '../strings/tenders_strings.dart';
|
||||
import '../widgets/main_tenders_slider.dart';
|
||||
import '../widgets/recommended_tenders_view.dart';
|
||||
import '../widgets/tenders_tab_bar.dart';
|
||||
|
||||
class MobileTendersPage extends StatefulWidget {
|
||||
const MobileTendersPage({super.key});
|
||||
const MobileTendersPage({required this.initialSelectedTab, super.key});
|
||||
|
||||
final int initialSelectedTab;
|
||||
|
||||
@override
|
||||
State<MobileTendersPage> createState() => _MobileTendersPageState();
|
||||
@@ -22,9 +20,6 @@ class MobileTendersPage extends StatefulWidget {
|
||||
class _MobileTendersPageState extends State<MobileTendersPage> {
|
||||
late final TendersViewModel viewModel;
|
||||
|
||||
/// 0 = All, 1 = Recommended.
|
||||
int _selectedTab = 0;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
@@ -49,63 +44,24 @@ class _MobileTendersPageState extends State<MobileTendersPage> {
|
||||
return Scaffold(
|
||||
backgroundColor: AppColors.backgroundColor,
|
||||
appBar: tenderMobileAppBar(title: TendersStrings.tendersTitle),
|
||||
body: SafeArea(
|
||||
body: const SafeArea(
|
||||
child: Column(
|
||||
children: [
|
||||
Padding(
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: 24.0.w(),
|
||||
vertical: 12.0.h(),
|
||||
),
|
||||
child: TendersTabBar(
|
||||
selectedIndex: _selectedTab,
|
||||
onChanged: (index) => setState(() => _selectedTab = index),
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child:
|
||||
_selectedTab == 0
|
||||
? const _AllTendersTab()
|
||||
: const RecommendedTendersView(),
|
||||
),
|
||||
// Tab bar hidden while tenders only shows recommendations.
|
||||
// Padding(
|
||||
// padding: EdgeInsets.symmetric(
|
||||
// horizontal: 24.0.w(),
|
||||
// vertical: 12.0.h(),
|
||||
// ),
|
||||
// child: TendersTabBar(
|
||||
// selectedIndex: 1,
|
||||
// onChanged: (index) {},
|
||||
// ),
|
||||
// ),
|
||||
Expanded(child: RecommendedTendersView()),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _AllTendersTab extends StatelessWidget {
|
||||
const _AllTendersTab();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Consumer<TendersViewModel>(
|
||||
builder: (context, viewModel, child) {
|
||||
if (viewModel.isLoading) {
|
||||
return const Center(
|
||||
child: CircularProgressIndicator(color: AppColors.jellyBean),
|
||||
);
|
||||
}
|
||||
if (viewModel.errorMessage != null) {
|
||||
return Center(child: Text(viewModel.errorMessage!));
|
||||
}
|
||||
|
||||
if ((viewModel.tendersResponse?.data?.tenders == null ||
|
||||
viewModel.tendersResponse!.data!.tenders!.isEmpty) &&
|
||||
viewModel.isLoading == false) {
|
||||
return const Center(child: Text(CommonStrings.noData));
|
||||
}
|
||||
|
||||
return SingleChildScrollView(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.symmetric(vertical: 18.0.h()),
|
||||
child: MainTendersSlider(
|
||||
tenders: viewModel.tendersResponse?.data?.tenders ?? [],
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,16 +4,15 @@ import 'package:tm_app/core/theme/colors.dart';
|
||||
import 'package:tm_app/core/utils/size_config.dart';
|
||||
import 'package:tm_app/view_models/tenders_view_model.dart';
|
||||
import 'package:tm_app/views/shared/tablet_navigation_widget.dart';
|
||||
import 'package:tm_app/views/tenders/widgets/main_tenders_slider.dart';
|
||||
|
||||
import '../../../core/constants/common_strings.dart';
|
||||
import '../../shared/tender_app_bar.dart';
|
||||
import '../strings/tenders_strings.dart';
|
||||
import '../widgets/recommended_tenders_view.dart';
|
||||
import '../widgets/tenders_tab_bar.dart';
|
||||
|
||||
class TabletTendersPage extends StatefulWidget {
|
||||
const TabletTendersPage({super.key});
|
||||
const TabletTendersPage({required this.initialSelectedTab, super.key});
|
||||
|
||||
final int initialSelectedTab;
|
||||
|
||||
@override
|
||||
State<TabletTendersPage> createState() => _TabletTendersPageState();
|
||||
@@ -22,9 +21,6 @@ class TabletTendersPage extends StatefulWidget {
|
||||
class _TabletTendersPageState extends State<TabletTendersPage> {
|
||||
late final TendersViewModel viewModel;
|
||||
|
||||
/// 0 = All, 1 = Recommended.
|
||||
int _selectedTab = 0;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
@@ -45,52 +41,18 @@ class _TabletTendersPageState extends State<TabletTendersPage> {
|
||||
drawer: const TabletNavigationWidget(currentIndex: 1),
|
||||
body: Padding(
|
||||
padding: EdgeInsetsDirectional.only(end: 24.0.w(), top: 24.0.h()),
|
||||
child: Column(
|
||||
child: const Column(
|
||||
children: [
|
||||
TendersTabBar(
|
||||
selectedIndex: _selectedTab,
|
||||
onChanged: (index) => setState(() => _selectedTab = index),
|
||||
),
|
||||
SizedBox(height: 24.0.h()),
|
||||
Expanded(
|
||||
child:
|
||||
_selectedTab == 0
|
||||
? const _AllTendersTab()
|
||||
: const RecommendedTendersView(),
|
||||
),
|
||||
// Tab bar hidden while tenders only shows recommendations.
|
||||
// TendersTabBar(
|
||||
// selectedIndex: 1,
|
||||
// onChanged: (index) {},
|
||||
// ),
|
||||
// SizedBox(height: 24.0.h()),
|
||||
Expanded(child: RecommendedTendersView()),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _AllTendersTab extends StatelessWidget {
|
||||
const _AllTendersTab();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Consumer<TendersViewModel>(
|
||||
builder: (context, viewModel, child) {
|
||||
if (viewModel.isLoading) {
|
||||
return const Center(
|
||||
child: CircularProgressIndicator(color: AppColors.jellyBean),
|
||||
);
|
||||
}
|
||||
if (viewModel.errorMessage != null) {
|
||||
return Center(child: Text(viewModel.errorMessage!));
|
||||
}
|
||||
if ((viewModel.tendersResponse?.data?.tenders == null ||
|
||||
viewModel.tendersResponse!.data!.tenders!.isEmpty) &&
|
||||
viewModel.isLoading == false) {
|
||||
return const Center(child: Text(CommonStrings.noData));
|
||||
}
|
||||
return SingleChildScrollView(
|
||||
child: MainTendersSlider(
|
||||
tenders: viewModel.tendersResponse?.data?.tenders ?? [],
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,9 @@ import 'm_tenders_page.dart';
|
||||
import 't_tenders_page.dart';
|
||||
|
||||
class TendersScreen extends StatefulWidget {
|
||||
const TendersScreen({super.key});
|
||||
const TendersScreen({this.initialTab, super.key});
|
||||
|
||||
final String? initialTab;
|
||||
|
||||
@override
|
||||
State<TendersScreen> createState() => _TendersScreenState();
|
||||
@@ -48,10 +50,11 @@ class _TendersScreenState extends State<TendersScreen> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
SizeConfig.init(context);
|
||||
return const ResponsiveBuilder(
|
||||
mobile: MobileTendersPage(),
|
||||
tablet: TabletTendersPage(),
|
||||
desktop: DesktopTendersPage(),
|
||||
final initialSelectedTab = widget.initialTab == 'recommended' ? 1 : 0;
|
||||
return ResponsiveBuilder(
|
||||
mobile: MobileTendersPage(initialSelectedTab: initialSelectedTab),
|
||||
tablet: TabletTendersPage(initialSelectedTab: initialSelectedTab),
|
||||
desktop: DesktopTendersPage(initialSelectedTab: initialSelectedTab),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ class AnimatedFeedbackButton extends StatefulWidget {
|
||||
final Color activeColor;
|
||||
final Color inactiveColor;
|
||||
final bool isActive;
|
||||
final bool isLoading;
|
||||
final VoidCallback onTap;
|
||||
final String tooltip;
|
||||
|
||||
@@ -18,6 +19,7 @@ class AnimatedFeedbackButton extends StatefulWidget {
|
||||
required this.isActive,
|
||||
required this.onTap,
|
||||
required this.tooltip,
|
||||
this.isLoading = false,
|
||||
super.key,
|
||||
});
|
||||
|
||||
@@ -63,6 +65,9 @@ class _AnimatedFeedbackButtonState extends State<AnimatedFeedbackButton>
|
||||
}
|
||||
|
||||
void _handleTap() {
|
||||
if (widget.isLoading) {
|
||||
return;
|
||||
}
|
||||
_clickController.forward().then((_) {
|
||||
_clickController.reverse();
|
||||
});
|
||||
@@ -75,7 +80,7 @@ class _AnimatedFeedbackButtonState extends State<AnimatedFeedbackButton>
|
||||
message: widget.tooltip,
|
||||
child: InkWell(
|
||||
splashColor: Colors.transparent,
|
||||
onTap: _handleTap,
|
||||
onTap: widget.isLoading ? null : _handleTap,
|
||||
child: AnimatedBuilder(
|
||||
animation: _clickController,
|
||||
builder: (context, child) {
|
||||
@@ -94,15 +99,23 @@ class _AnimatedFeedbackButtonState extends State<AnimatedFeedbackButton>
|
||||
duration: const Duration(milliseconds: 100),
|
||||
curve: Curves.easeInOut,
|
||||
builder: (context, color, child) {
|
||||
return SvgPicture.asset(
|
||||
return SizedBox(
|
||||
width: 24.0.w(),
|
||||
height: 24.0.w(),
|
||||
child:
|
||||
widget.isLoading
|
||||
? CircularProgressIndicator(
|
||||
strokeWidth: 2,
|
||||
color: color ?? widget.inactiveColor,
|
||||
)
|
||||
: SvgPicture.asset(
|
||||
fit: BoxFit.cover,
|
||||
widget.iconPath,
|
||||
colorFilter: ColorFilter.mode(
|
||||
color ?? widget.inactiveColor,
|
||||
BlendMode.srcATop,
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
|
||||
@@ -41,6 +41,52 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
|
||||
if (widget.isDesktop) {
|
||||
_scrollController.addListener(_onScroll);
|
||||
}
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (mounted) {
|
||||
_hydrateRenderedFeedback();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
void didUpdateWidget(covariant MainTendersSlider oldWidget) {
|
||||
super.didUpdateWidget(oldWidget);
|
||||
final oldIds = oldWidget.tenders.map((tender) => tender.id).toList();
|
||||
final newIds = widget.tenders.map((tender) => tender.id).toList();
|
||||
if (oldIds.length != newIds.length ||
|
||||
!Iterable<int>.generate(
|
||||
newIds.length,
|
||||
).every((index) => oldIds[index] == newIds[index])) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (mounted) {
|
||||
_hydrateRenderedFeedback();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void _hydrateRenderedFeedback() {
|
||||
if (widget.tenders.isEmpty) {
|
||||
return;
|
||||
}
|
||||
|
||||
final viewModel = context.read<TendersViewModel>();
|
||||
final tendersToHydrate =
|
||||
widget.isDesktop
|
||||
? widget.tenders
|
||||
: <TenderData>[
|
||||
widget.tenders[(currentPage - 1).clamp(
|
||||
0,
|
||||
widget.tenders.length - 1,
|
||||
)],
|
||||
];
|
||||
|
||||
for (final tender in tendersToHydrate) {
|
||||
final id = tender.id;
|
||||
if (id != null && id.isNotEmpty) {
|
||||
viewModel.getTenderFeedback(id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void _onScroll() {
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:tm_app/core/routes/app_routes.dart';
|
||||
import 'package:tm_app/core/theme/colors.dart';
|
||||
import 'package:tm_app/core/utils/size_config.dart';
|
||||
import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
|
||||
import 'package:tm_app/view_models/ai_recommendations_view_model.dart';
|
||||
|
||||
import '../strings/tenders_strings.dart';
|
||||
import 'recommendation_card.dart';
|
||||
import 'main_tenders_slider.dart';
|
||||
import 'tender_card_shimmer.dart';
|
||||
|
||||
/// The "Recommended" (AI) tab body. Handles loading, empty/"still learning",
|
||||
/// error+retry and the 503 fallback states for [AiRecommendationsViewModel].
|
||||
/// The "Recommended" tab body. Handles loading, empty/"still learning",
|
||||
/// error+retry and the recommended tender list for [AiRecommendationsViewModel].
|
||||
class RecommendedTendersView extends StatefulWidget {
|
||||
const RecommendedTendersView({super.key});
|
||||
const RecommendedTendersView({super.key, this.isDesktop = false});
|
||||
|
||||
final bool isDesktop;
|
||||
|
||||
@override
|
||||
State<RecommendedTendersView> createState() => _RecommendedTendersViewState();
|
||||
@@ -34,7 +35,7 @@ class _RecommendedTendersViewState extends State<RecommendedTendersView> {
|
||||
return Consumer<AiRecommendationsViewModel>(
|
||||
builder: (context, vm, child) {
|
||||
if (vm.isLoading) {
|
||||
return const _LoadingSkeleton();
|
||||
return _LoadingSkeleton(isDesktop: widget.isDesktop);
|
||||
}
|
||||
if (vm.errorMessage != null) {
|
||||
return _MessageState(
|
||||
@@ -49,20 +50,21 @@ class _RecommendedTendersViewState extends State<RecommendedTendersView> {
|
||||
onRetry: vm.refresh,
|
||||
);
|
||||
}
|
||||
if (vm.usingFallback && vm.fallbackTenders.isNotEmpty) {
|
||||
return _FallbackList(tenders: vm.fallbackTenders, onRefresh: vm.refresh);
|
||||
if (vm.recommendedTenders.isNotEmpty) {
|
||||
if (widget.isDesktop) {
|
||||
return Padding(
|
||||
padding: EdgeInsets.symmetric(vertical: 4.0.h()),
|
||||
child: MainTendersSlider(
|
||||
tenders: vm.recommendedTenders,
|
||||
isDesktop: true,
|
||||
),
|
||||
);
|
||||
}
|
||||
if (vm.items.isNotEmpty) {
|
||||
return RefreshIndicator(
|
||||
color: AppColors.jellyBean,
|
||||
onRefresh: vm.refresh,
|
||||
child: ListView.separated(
|
||||
padding: EdgeInsets.all(16.0.h()),
|
||||
itemCount: vm.items.length,
|
||||
separatorBuilder: (_, __) => SizedBox(height: 12.0.h()),
|
||||
itemBuilder:
|
||||
(context, index) =>
|
||||
RecommendationCard(item: vm.items[index]),
|
||||
|
||||
return SingleChildScrollView(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.symmetric(vertical: 18.0.h()),
|
||||
child: MainTendersSlider(tenders: vm.recommendedTenders),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -76,116 +78,6 @@ class _RecommendedTendersViewState extends State<RecommendedTendersView> {
|
||||
}
|
||||
}
|
||||
|
||||
/// Renders the legacy keyword-based fallback list with a notice banner.
|
||||
class _FallbackList extends StatelessWidget {
|
||||
const _FallbackList({required this.tenders, required this.onRefresh});
|
||||
|
||||
final List<TenderData> tenders;
|
||||
final Future<void> Function() onRefresh;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return RefreshIndicator(
|
||||
color: AppColors.jellyBean,
|
||||
onRefresh: onRefresh,
|
||||
child: ListView.separated(
|
||||
padding: EdgeInsets.all(16.0.h()),
|
||||
itemCount: tenders.length + 1,
|
||||
separatorBuilder: (_, __) => SizedBox(height: 12.0.h()),
|
||||
itemBuilder: (context, index) {
|
||||
if (index == 0) {
|
||||
return _fallbackNotice();
|
||||
}
|
||||
return _FallbackTenderCard(tender: tenders[index - 1]);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _fallbackNotice() {
|
||||
return Container(
|
||||
width: double.infinity,
|
||||
padding: EdgeInsets.all(12.0.h()),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.orange10,
|
||||
borderRadius: BorderRadius.circular(8.0.w()),
|
||||
),
|
||||
child: Text(
|
||||
TendersStrings.recommendedFallbackNotice,
|
||||
style: TextStyle(
|
||||
fontSize: 13.0.sp(),
|
||||
fontWeight: FontWeight.w500,
|
||||
color: AppColors.yellow4,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Lightweight card for a fallback tender. Decoupled from [TendersViewModel]
|
||||
/// (no feedback/pagination) so it can render outside the All-tab flow.
|
||||
class _FallbackTenderCard extends StatelessWidget {
|
||||
const _FallbackTenderCard({required this.tender});
|
||||
|
||||
final TenderData tender;
|
||||
|
||||
void _openDetail(BuildContext context) {
|
||||
final id = tender.id;
|
||||
if (id == null || id.isEmpty) {
|
||||
return;
|
||||
}
|
||||
TenderDetailRouteData(tenderId: id).push(context);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final title = tender.title?.trim() ?? '';
|
||||
final buyer = tender.buyerOrganization?.name?.trim() ?? '';
|
||||
return InkWell(
|
||||
borderRadius: BorderRadius.circular(12.0.w()),
|
||||
onTap: () => _openDetail(context),
|
||||
child: Container(
|
||||
width: double.infinity,
|
||||
padding: EdgeInsets.all(16.0.h()),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.grey0,
|
||||
borderRadius: BorderRadius.circular(12.0.w()),
|
||||
border: Border.all(color: AppColors.grey30),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
if (title.isNotEmpty)
|
||||
Text(
|
||||
title,
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
fontSize: 15.0.sp(),
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.grey80,
|
||||
),
|
||||
),
|
||||
if (buyer.isNotEmpty) ...[
|
||||
SizedBox(height: 8.0.h()),
|
||||
Text(
|
||||
buyer,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
fontSize: 13.0.sp(),
|
||||
fontWeight: FontWeight.w400,
|
||||
color: AppColors.grey60,
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Centered title/body message with an optional retry button. Wrapped in a
|
||||
/// scroll view so pull-to-refresh works even when empty.
|
||||
class _MessageState extends StatelessWidget {
|
||||
@@ -261,23 +153,18 @@ class _MessageState extends StatelessWidget {
|
||||
|
||||
/// Simple placeholder list shown while recommendations load.
|
||||
class _LoadingSkeleton extends StatelessWidget {
|
||||
const _LoadingSkeleton();
|
||||
const _LoadingSkeleton({required this.isDesktop});
|
||||
|
||||
final bool isDesktop;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ListView.separated(
|
||||
padding: EdgeInsets.all(16.0.h()),
|
||||
itemCount: 4,
|
||||
separatorBuilder: (_, __) => SizedBox(height: 12.0.h()),
|
||||
itemBuilder:
|
||||
(context, index) => Container(
|
||||
height: 120.0.h(),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.grey0,
|
||||
borderRadius: BorderRadius.circular(12.0.w()),
|
||||
border: Border.all(color: AppColors.grey30),
|
||||
),
|
||||
),
|
||||
itemCount: isDesktop ? 3 : 2,
|
||||
separatorBuilder:
|
||||
(_, __) => SizedBox(height: isDesktop ? 20.0.h() : 52.0.h()),
|
||||
itemBuilder: (context, index) => TenderCardShimmer(isDesktop: isDesktop),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,6 +48,7 @@ class TenderActionButtonsRow extends StatelessWidget {
|
||||
|
||||
final feedback = viewModel.getFeedbackForTender(tender.id!);
|
||||
final isDisliked = feedback?.feedbackType == TenderFeedback.disliked.value;
|
||||
final isLoading = viewModel.isFeedbackLoading(tender.id!);
|
||||
|
||||
return Column(
|
||||
children: [
|
||||
@@ -56,9 +57,10 @@ class TenderActionButtonsRow extends StatelessWidget {
|
||||
activeColor: AppColors.errorColor,
|
||||
inactiveColor: AppColors.grey50,
|
||||
isActive: isDisliked,
|
||||
isLoading: isLoading,
|
||||
tooltip: TendersStrings.dislike,
|
||||
onTap: () {
|
||||
viewModel.toogleFeedback(
|
||||
viewModel.toggleFeedback(
|
||||
tenderId: tender.id!,
|
||||
feedbackType: TenderFeedback.disliked.value,
|
||||
);
|
||||
@@ -85,6 +87,7 @@ class TenderActionButtonsRow extends StatelessWidget {
|
||||
|
||||
final feedback = viewModel.getFeedbackForTender(tender.id!);
|
||||
final isLiked = feedback?.feedbackType == TenderFeedback.liked.value;
|
||||
final isLoading = viewModel.isFeedbackLoading(tender.id!);
|
||||
|
||||
return Column(
|
||||
children: [
|
||||
@@ -93,9 +96,10 @@ class TenderActionButtonsRow extends StatelessWidget {
|
||||
activeColor: AppColors.successColor,
|
||||
inactiveColor: AppColors.grey50,
|
||||
isActive: isLiked,
|
||||
isLoading: isLoading,
|
||||
tooltip: TendersStrings.like,
|
||||
onTap: () {
|
||||
viewModel.toogleFeedback(
|
||||
viewModel.toggleFeedback(
|
||||
tenderId: tender.id!,
|
||||
feedbackType: TenderFeedback.liked.value,
|
||||
);
|
||||
|
||||
@@ -198,7 +198,7 @@ class TenderCard extends StatelessWidget {
|
||||
}
|
||||
|
||||
Widget _tenderTitle() {
|
||||
return Text(
|
||||
return SelectableText(
|
||||
tender.title ?? '',
|
||||
maxLines: isDesktop ? 2 : 4,
|
||||
style: TextStyle(
|
||||
|
||||
@@ -0,0 +1,173 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:tm_app/core/theme/colors.dart';
|
||||
import 'package:tm_app/core/utils/size_config.dart';
|
||||
|
||||
class TenderCardShimmer extends StatelessWidget {
|
||||
const TenderCardShimmer({super.key, this.isDesktop = false});
|
||||
|
||||
final bool isDesktop;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return _Shimmer(
|
||||
child: Container(
|
||||
width: double.infinity,
|
||||
margin: EdgeInsets.symmetric(horizontal: 16.0.w()),
|
||||
height: isDesktop ? 350.0.h() : 587.0.h(),
|
||||
padding: EdgeInsets.all(16.0.w()),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.grey0,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(color: AppColors.grey30),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
_bar(width: isDesktop ? 120.0.w() : 140.0.w(), height: 14.0.h()),
|
||||
SizedBox(height: 16.0.h()),
|
||||
_block(height: isDesktop ? 58.0.h() : 70.0.h()),
|
||||
SizedBox(height: isDesktop ? 12.0.h() : 20.0.h()),
|
||||
_bar(width: double.infinity, height: 18.0.h()),
|
||||
SizedBox(height: 8.0.h()),
|
||||
_fractionBar(widthFactor: 0.72, height: 18.0.h()),
|
||||
SizedBox(height: 16.0.h()),
|
||||
_bar(width: double.infinity, height: 14.0.h()),
|
||||
SizedBox(height: 8.0.h()),
|
||||
_bar(width: double.infinity, height: 14.0.h()),
|
||||
SizedBox(height: 8.0.h()),
|
||||
_fractionBar(widthFactor: 0.55, height: 14.0.h()),
|
||||
const Spacer(),
|
||||
Row(
|
||||
children: [
|
||||
_circle(size: 24.0.h()),
|
||||
SizedBox(width: 8.0.w()),
|
||||
_bar(width: 60.0.w(), height: 14.0.h()),
|
||||
const Spacer(),
|
||||
_pill(width: 108.0.w(), height: 40.0.h()),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _bar({required double width, required double height}) {
|
||||
return Container(
|
||||
width: width,
|
||||
height: height,
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.grey20,
|
||||
borderRadius: BorderRadius.circular(6),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _fractionBar({required double widthFactor, required double height}) {
|
||||
return FractionallySizedBox(
|
||||
widthFactor: widthFactor,
|
||||
alignment: AlignmentDirectional.centerStart,
|
||||
child: _bar(width: double.infinity, height: height),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _block({required double height}) {
|
||||
return Container(
|
||||
width: double.infinity,
|
||||
height: height,
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.grey20,
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _pill({required double width, required double height}) {
|
||||
return Container(
|
||||
width: width,
|
||||
height: height,
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.grey20,
|
||||
borderRadius: BorderRadius.circular(100),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _circle({required double size}) {
|
||||
return Container(
|
||||
width: size,
|
||||
height: size,
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.grey20,
|
||||
shape: BoxShape.circle,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _Shimmer extends StatefulWidget {
|
||||
const _Shimmer({required this.child});
|
||||
|
||||
final Widget child;
|
||||
|
||||
@override
|
||||
State<_Shimmer> createState() => _ShimmerState();
|
||||
}
|
||||
|
||||
class _ShimmerState extends State<_Shimmer>
|
||||
with SingleTickerProviderStateMixin {
|
||||
late final AnimationController _controller;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_controller = AnimationController(
|
||||
vsync: this,
|
||||
duration: const Duration(milliseconds: 1400),
|
||||
)..repeat();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_controller.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return AnimatedBuilder(
|
||||
animation: _controller,
|
||||
child: widget.child,
|
||||
builder: (context, child) {
|
||||
return ShaderMask(
|
||||
blendMode: BlendMode.srcATop,
|
||||
shaderCallback: (bounds) {
|
||||
final shimmerWidth = bounds.width * 0.8;
|
||||
final offset = (bounds.width + shimmerWidth) * _controller.value;
|
||||
return LinearGradient(
|
||||
begin: Alignment.centerLeft,
|
||||
end: Alignment.centerRight,
|
||||
colors: [AppColors.grey20, AppColors.grey10, AppColors.grey20],
|
||||
stops: const [0.25, 0.5, 0.75],
|
||||
transform: _SlidingGradientTransform(
|
||||
slidePercent: (offset - shimmerWidth) / bounds.width,
|
||||
),
|
||||
).createShader(bounds);
|
||||
},
|
||||
child: child,
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _SlidingGradientTransform extends GradientTransform {
|
||||
const _SlidingGradientTransform({required this.slidePercent});
|
||||
|
||||
final double slidePercent;
|
||||
|
||||
@override
|
||||
Matrix4 transform(Rect bounds, {TextDirection? textDirection}) {
|
||||
return Matrix4.translationValues(bounds.width * slidePercent, 0, 0);
|
||||
}
|
||||
}
|
||||
@@ -4,8 +4,7 @@ import 'package:tm_app/core/utils/size_config.dart';
|
||||
|
||||
import '../strings/tenders_strings.dart';
|
||||
|
||||
/// Segmented control switching between the "All" tenders list and the
|
||||
/// "Recommended" AI tab.
|
||||
/// Segmented control for the tenders list.
|
||||
class TendersTabBar extends StatelessWidget {
|
||||
const TendersTabBar({
|
||||
required this.selectedIndex,
|
||||
@@ -13,7 +12,7 @@ class TendersTabBar extends StatelessWidget {
|
||||
super.key,
|
||||
});
|
||||
|
||||
/// 0 = All, 1 = Recommended.
|
||||
/// 1 = Recommended. The former All tab is intentionally hidden.
|
||||
final int selectedIndex;
|
||||
final ValueChanged<int> onChanged;
|
||||
|
||||
@@ -29,7 +28,8 @@ class TendersTabBar extends StatelessWidget {
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
_segment(TendersStrings.allTab, 0),
|
||||
// All tenders is hidden for now.
|
||||
// _segment(TendersStrings.allTab, 0),
|
||||
_segment(TendersStrings.recommendedTab, 1),
|
||||
],
|
||||
),
|
||||
|
||||
@@ -11,6 +11,7 @@ import 'package:tm_app/views/your_tenders/strings/your_tenders_strings.dart';
|
||||
import 'package:tm_app/views/your_tenders/widgets/filter_button.dart';
|
||||
import 'package:tm_app/views/your_tenders/widgets/liked_disliked_tenders_list.dart';
|
||||
import 'package:tm_app/views/your_tenders/widgets/tenders_submitted.dart';
|
||||
import 'package:tm_app/views/your_tenders/widgets/submission_workflow.dart';
|
||||
|
||||
import '../../shared/desktop_navigation_widget.dart';
|
||||
import '../../shared/page_selection_dialog.dart';
|
||||
@@ -79,7 +80,9 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
|
||||
|
||||
Widget content;
|
||||
|
||||
if (viewModel.selectedStatus ==
|
||||
if (viewModel.isSubmissionWorkflow) {
|
||||
content = const SubmissionWorkflow();
|
||||
} else if (viewModel.selectedStatus ==
|
||||
TenderFeedback.liked.value &&
|
||||
viewModel.likedTendersData != null) {
|
||||
content = LikedDislikedTendersList(
|
||||
@@ -114,6 +117,7 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
|
||||
Expanded(child: content),
|
||||
SizedBox(height: 10.0.h()),
|
||||
|
||||
if (!viewModel.isSubmissionWorkflow)
|
||||
_listPagesControll(context, viewModel),
|
||||
|
||||
SizedBox(height: 30.0.h()),
|
||||
|
||||
@@ -7,6 +7,7 @@ import 'package:tm_app/views/your_tenders/strings/your_tenders_strings.dart';
|
||||
import 'package:tm_app/views/your_tenders/widgets/filter_button.dart';
|
||||
import 'package:tm_app/views/your_tenders/widgets/liked_disliked_tenders_list.dart';
|
||||
import 'package:tm_app/views/your_tenders/widgets/tenders_submitted.dart';
|
||||
import 'package:tm_app/views/your_tenders/widgets/submission_workflow.dart';
|
||||
|
||||
import '../../../core/constants/tender_feedback.dart';
|
||||
|
||||
@@ -60,7 +61,9 @@ class _YourTendersMobilePageState extends State<YourTendersMobilePage> {
|
||||
|
||||
return Column(
|
||||
children: [
|
||||
if (viewModel.selectedStatus ==
|
||||
if (viewModel.isSubmissionWorkflow)
|
||||
const Expanded(child: SubmissionWorkflow())
|
||||
else if (viewModel.selectedStatus ==
|
||||
TenderFeedback.liked.value &&
|
||||
viewModel.likedTendersData != null)
|
||||
Expanded(
|
||||
|
||||
@@ -9,6 +9,7 @@ import 'package:tm_app/views/shared/tablet_desktop_appbar.dart';
|
||||
import 'package:tm_app/views/your_tenders/widgets/filter_button.dart';
|
||||
import 'package:tm_app/views/your_tenders/widgets/liked_disliked_tenders_list.dart';
|
||||
import 'package:tm_app/views/your_tenders/widgets/tenders_submitted.dart';
|
||||
import 'package:tm_app/views/your_tenders/widgets/submission_workflow.dart';
|
||||
|
||||
import '../../../core/constants/tender_feedback.dart';
|
||||
import '../../shared/tablet_navigation_widget.dart';
|
||||
@@ -85,7 +86,9 @@ class _YourTendersTabletPageState extends State<YourTendersTabletPage>
|
||||
|
||||
Widget content;
|
||||
|
||||
if (viewModel.selectedStatus ==
|
||||
if (viewModel.isSubmissionWorkflow) {
|
||||
content = const SubmissionWorkflow();
|
||||
} else if (viewModel.selectedStatus ==
|
||||
TenderFeedback.liked.value &&
|
||||
viewModel.likedTendersData != null) {
|
||||
content = LikedDislikedTendersList(
|
||||
@@ -120,6 +123,7 @@ class _YourTendersTabletPageState extends State<YourTendersTabletPage>
|
||||
Expanded(child: content),
|
||||
SizedBox(height: 10.0.h()),
|
||||
|
||||
if (!viewModel.isSubmissionWorkflow)
|
||||
_listPagesControll(context, viewModel),
|
||||
|
||||
const SizedBox(height: 30.0),
|
||||
|
||||
@@ -0,0 +1,511 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:tm_app/core/theme/colors.dart';
|
||||
import 'package:tm_app/core/utils/date_utils.dart';
|
||||
import 'package:tm_app/data/services/model/tender_submission/tender_submission.dart';
|
||||
import 'package:tm_app/view_models/your_tenders_view_model.dart';
|
||||
|
||||
class SubmissionWorkflow extends StatelessWidget {
|
||||
const SubmissionWorkflow({super.key});
|
||||
|
||||
static const _stageLabels = <String, String>{
|
||||
'opportunity': 'Opportunity',
|
||||
'in_progress': 'In Progress',
|
||||
'submitted': 'Submitted',
|
||||
'not_applied': 'Not Applied',
|
||||
};
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Consumer<YourTendersViewModel>(
|
||||
builder: (context, viewModel, _) {
|
||||
final submissions = viewModel.submissionsData?.data ?? const [];
|
||||
return Column(
|
||||
children: [
|
||||
SizedBox(
|
||||
height: 54,
|
||||
child: ListView(
|
||||
scrollDirection: Axis.horizontal,
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 16,
|
||||
vertical: 6,
|
||||
),
|
||||
children:
|
||||
YourTendersViewModel.submissionStages.map((stage) {
|
||||
final selected =
|
||||
viewModel.selectedSubmissionStage == stage;
|
||||
final count =
|
||||
viewModel.submissionStats?.byStage[stage] ?? 0;
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(right: 8),
|
||||
child: ChoiceChip(
|
||||
selected: selected,
|
||||
onSelected:
|
||||
(_) => viewModel.selectSubmissionStage(stage),
|
||||
label: Text('${_stageLabels[stage]} ($count)'),
|
||||
selectedColor: AppColors.secondary20,
|
||||
side: BorderSide(
|
||||
color:
|
||||
selected
|
||||
? AppColors.secondary50
|
||||
: AppColors.grey30,
|
||||
),
|
||||
),
|
||||
);
|
||||
}).toList(),
|
||||
),
|
||||
),
|
||||
if (viewModel.submissionActionError != null)
|
||||
Container(
|
||||
width: double.infinity,
|
||||
margin: const EdgeInsets.fromLTRB(16, 4, 16, 4),
|
||||
padding: const EdgeInsets.fromLTRB(12, 8, 4, 8),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.red0,
|
||||
border: Border.all(color: AppColors.red10),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(Icons.error_outline, color: AppColors.error, size: 18),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
viewModel.submissionActionError!,
|
||||
style: TextStyle(color: AppColors.error, fontSize: 12),
|
||||
),
|
||||
),
|
||||
IconButton(
|
||||
visualDensity: VisualDensity.compact,
|
||||
onPressed: viewModel.dismissSubmissionActionError,
|
||||
icon: const Icon(Icons.close, size: 18),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
if (viewModel.isLoading && submissions.isEmpty)
|
||||
const Expanded(
|
||||
child: Center(
|
||||
child: CircularProgressIndicator(
|
||||
color: AppColors.secondary50,
|
||||
),
|
||||
),
|
||||
)
|
||||
else if (submissions.isEmpty)
|
||||
Expanded(
|
||||
child: Center(
|
||||
child: Text(
|
||||
'No ${_stageLabels[viewModel.selectedSubmissionStage]?.toLowerCase()} submissions.',
|
||||
style: TextStyle(color: AppColors.grey60),
|
||||
),
|
||||
),
|
||||
)
|
||||
else
|
||||
Expanded(
|
||||
child: RefreshIndicator(
|
||||
onRefresh: viewModel.loadSubmissions,
|
||||
child: ListView.builder(
|
||||
physics: const AlwaysScrollableScrollPhysics(),
|
||||
padding: const EdgeInsets.fromLTRB(16, 8, 16, 24),
|
||||
itemCount: submissions.length,
|
||||
itemBuilder:
|
||||
(context, index) =>
|
||||
_SubmissionCard(submission: submissions[index]),
|
||||
),
|
||||
),
|
||||
),
|
||||
if ((viewModel.submissionsData?.meta?.pages ?? 1) > 1)
|
||||
Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
IconButton(
|
||||
tooltip: 'Previous page',
|
||||
onPressed:
|
||||
viewModel.currentPage > 1 && !viewModel.isLoading
|
||||
? () => viewModel.jumpToPage(
|
||||
viewModel.currentPage - 1,
|
||||
)
|
||||
: null,
|
||||
icon: const Icon(Icons.chevron_left),
|
||||
),
|
||||
Text(
|
||||
'Page ${viewModel.currentPage} of ${viewModel.totalPages}',
|
||||
style: TextStyle(color: AppColors.grey60),
|
||||
),
|
||||
IconButton(
|
||||
tooltip: 'Next page',
|
||||
onPressed:
|
||||
viewModel.currentPage < viewModel.totalPages &&
|
||||
!viewModel.isLoading
|
||||
? () => viewModel.jumpToPage(
|
||||
viewModel.currentPage + 1,
|
||||
)
|
||||
: null,
|
||||
icon: const Icon(Icons.chevron_right),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _SubmissionCard extends StatelessWidget {
|
||||
const _SubmissionCard({required this.submission});
|
||||
|
||||
final TenderSubmission submission;
|
||||
|
||||
static const _statusLabels = <String, String>{
|
||||
'opportunity': 'Opportunity',
|
||||
'validating': 'Validating',
|
||||
'partner_pending': 'Partner Pending',
|
||||
'applying': 'Applying',
|
||||
'sent_waiting': 'Sent / Waiting',
|
||||
'rejected': 'Lost',
|
||||
'contract': 'Contract Awarded',
|
||||
'not_applied': 'Not Applied',
|
||||
};
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final viewModel = context.watch<YourTendersViewModel>();
|
||||
final tender = submission.tender;
|
||||
final busy = viewModel.updatingSubmissionId == submission.id;
|
||||
final deadline = tender?.submissionDeadline ?? tender?.tenderDeadline;
|
||||
|
||||
return Card(
|
||||
color: AppColors.cardBackground,
|
||||
elevation: 0,
|
||||
margin: const EdgeInsets.only(bottom: 12),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
side: BorderSide(color: AppColors.borderColor),
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(16),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(
|
||||
tender?.title?.trim().isNotEmpty == true
|
||||
? tender!.title!
|
||||
: 'Tender ${submission.tenderId}',
|
||||
style: TextStyle(
|
||||
color: AppColors.grey80,
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
_StatusBadge(
|
||||
label: _statusLabels[submission.status] ?? submission.status,
|
||||
status: submission.status,
|
||||
),
|
||||
],
|
||||
),
|
||||
if (tender?.description?.trim().isNotEmpty == true) ...[
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
tender!.description!,
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(color: AppColors.grey70, height: 1.4),
|
||||
),
|
||||
],
|
||||
const SizedBox(height: 12),
|
||||
Wrap(
|
||||
spacing: 16,
|
||||
runSpacing: 6,
|
||||
children: [
|
||||
if (tender?.countryCode?.isNotEmpty == true)
|
||||
_Meta(
|
||||
icon: Icons.location_on_outlined,
|
||||
text: tender!.countryCode!,
|
||||
),
|
||||
if (deadline != null)
|
||||
_Meta(
|
||||
icon: Icons.event_outlined,
|
||||
text: 'Deadline ${timeConvertor(deadline)}',
|
||||
),
|
||||
if (tender?.buyerOrganization?.name?.isNotEmpty == true)
|
||||
_Meta(
|
||||
icon: Icons.business_outlined,
|
||||
text: tender!.buyerOrganization!.name!,
|
||||
),
|
||||
],
|
||||
),
|
||||
if (submission.statusHistory.isNotEmpty) ...[
|
||||
const SizedBox(height: 4),
|
||||
ExpansionTile(
|
||||
tilePadding: EdgeInsets.zero,
|
||||
childrenPadding: EdgeInsets.zero,
|
||||
dense: true,
|
||||
title: Text(
|
||||
'Activity (${submission.statusHistory.length})',
|
||||
style: TextStyle(color: AppColors.grey60, fontSize: 13),
|
||||
),
|
||||
children:
|
||||
submission.statusHistory.reversed
|
||||
.map(
|
||||
(item) => ListTile(
|
||||
dense: true,
|
||||
contentPadding: EdgeInsets.zero,
|
||||
leading: const Icon(Icons.circle, size: 8),
|
||||
title: Text(
|
||||
_statusLabels[item.status] ?? item.status,
|
||||
style: TextStyle(color: AppColors.grey80),
|
||||
),
|
||||
subtitle: Text(
|
||||
[
|
||||
timeConvertor(item.changedAt, hasTime: true),
|
||||
if (item.description?.isNotEmpty == true)
|
||||
item.description!,
|
||||
if (item.reason?.isNotEmpty == true)
|
||||
item.reason!,
|
||||
].join(' · '),
|
||||
),
|
||||
),
|
||||
)
|
||||
.toList(),
|
||||
),
|
||||
],
|
||||
if (!submission.isTerminal) ...[
|
||||
const SizedBox(height: 12),
|
||||
if (busy)
|
||||
const LinearProgressIndicator(color: AppColors.secondary50)
|
||||
else
|
||||
_Actions(submission: submission),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _Actions extends StatelessWidget {
|
||||
const _Actions({required this.submission});
|
||||
|
||||
final TenderSubmission submission;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final primary = <({String label, String status, String description})>[];
|
||||
switch (submission.status) {
|
||||
case 'opportunity':
|
||||
primary.add((
|
||||
label: 'Start validation',
|
||||
status: 'validating',
|
||||
description: 'User accepted tender',
|
||||
));
|
||||
case 'validating':
|
||||
if (submission.submissionMode == 'partnership') {
|
||||
primary.add((
|
||||
label: 'Wait for partner',
|
||||
status: 'partner_pending',
|
||||
description: 'Validation completed; waiting for partner documents',
|
||||
));
|
||||
} else if (submission.submissionMode == 'self-apply') {
|
||||
primary.add((
|
||||
label: 'Start applying',
|
||||
status: 'applying',
|
||||
description: 'Validation completed',
|
||||
));
|
||||
} else {
|
||||
primary.addAll([
|
||||
(
|
||||
label: 'Start applying',
|
||||
status: 'applying',
|
||||
description: 'Validation completed',
|
||||
),
|
||||
(
|
||||
label: 'Wait for partner',
|
||||
status: 'partner_pending',
|
||||
description:
|
||||
'Validation completed; waiting for partner documents',
|
||||
),
|
||||
]);
|
||||
}
|
||||
case 'partner_pending':
|
||||
primary.add((
|
||||
label: 'Partner docs ready',
|
||||
status: 'applying',
|
||||
description: 'Partner documents received',
|
||||
));
|
||||
case 'applying':
|
||||
primary.add((
|
||||
label: 'Submitted to buyer',
|
||||
status: 'sent_waiting',
|
||||
description: 'Application filed with procurement authority',
|
||||
));
|
||||
case 'sent_waiting':
|
||||
primary.addAll([
|
||||
(
|
||||
label: 'Mark won',
|
||||
status: 'contract',
|
||||
description: 'Contract awarded',
|
||||
),
|
||||
(
|
||||
label: 'Mark lost',
|
||||
status: 'rejected',
|
||||
description: 'Buyer rejected bid',
|
||||
),
|
||||
]);
|
||||
}
|
||||
|
||||
return Wrap(
|
||||
spacing: 8,
|
||||
runSpacing: 8,
|
||||
children: [
|
||||
for (final action in primary)
|
||||
FilledButton(
|
||||
onPressed:
|
||||
() => _confirmUpdate(
|
||||
context,
|
||||
status: action.status,
|
||||
label: action.label,
|
||||
description: action.description,
|
||||
),
|
||||
style: FilledButton.styleFrom(
|
||||
backgroundColor: AppColors.secondary50,
|
||||
),
|
||||
child: Text(action.label),
|
||||
),
|
||||
if (submission.status != 'sent_waiting')
|
||||
OutlinedButton(
|
||||
onPressed: () => _reject(context),
|
||||
style: OutlinedButton.styleFrom(foregroundColor: AppColors.error),
|
||||
child: const Text('Do not apply'),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _confirmUpdate(
|
||||
BuildContext context, {
|
||||
required String status,
|
||||
required String label,
|
||||
required String description,
|
||||
}) async {
|
||||
final confirmed = await showDialog<bool>(
|
||||
context: context,
|
||||
builder:
|
||||
(dialogContext) => AlertDialog(
|
||||
title: Text(label),
|
||||
content: const Text('Update this tender submission?'),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(dialogContext, false),
|
||||
child: const Text('Cancel'),
|
||||
),
|
||||
FilledButton(
|
||||
onPressed: () => Navigator.pop(dialogContext, true),
|
||||
child: const Text('Confirm'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
if (confirmed == true && context.mounted) {
|
||||
await context.read<YourTendersViewModel>().updateSubmissionStatus(
|
||||
submission: submission,
|
||||
status: status,
|
||||
description: description,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _reject(BuildContext context) async {
|
||||
final controller = TextEditingController();
|
||||
final reason = await showDialog<String>(
|
||||
context: context,
|
||||
builder:
|
||||
(dialogContext) => AlertDialog(
|
||||
title: const Text('Do not apply'),
|
||||
content: TextField(
|
||||
controller: controller,
|
||||
maxLength: 500,
|
||||
maxLines: 3,
|
||||
decoration: const InputDecoration(
|
||||
labelText: 'Reason (optional)',
|
||||
border: OutlineInputBorder(),
|
||||
),
|
||||
),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(dialogContext),
|
||||
child: const Text('Cancel'),
|
||||
),
|
||||
FilledButton(
|
||||
onPressed: () => Navigator.pop(dialogContext, controller.text),
|
||||
child: const Text('Confirm'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
controller.dispose();
|
||||
if (reason != null && context.mounted) {
|
||||
await context.read<YourTendersViewModel>().updateSubmissionStatus(
|
||||
submission: submission,
|
||||
status: 'not_applied',
|
||||
reason: reason,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class _StatusBadge extends StatelessWidget {
|
||||
const _StatusBadge({required this.label, required this.status});
|
||||
final String label;
|
||||
final String status;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final terminal = status == 'rejected' || status == 'not_applied';
|
||||
final won = status == 'contract';
|
||||
final color =
|
||||
terminal
|
||||
? AppColors.error
|
||||
: (won ? AppColors.green30 : AppColors.blue10);
|
||||
return Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
|
||||
decoration: BoxDecoration(
|
||||
color: color.withValues(alpha: .12),
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
),
|
||||
child: Text(
|
||||
label,
|
||||
style: TextStyle(
|
||||
color: color,
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _Meta extends StatelessWidget {
|
||||
const _Meta({required this.icon, required this.text});
|
||||
final IconData icon;
|
||||
final String text;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) => Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(icon, size: 16, color: AppColors.grey60),
|
||||
const SizedBox(width: 4),
|
||||
Text(text, style: TextStyle(color: AppColors.grey60, fontSize: 12)),
|
||||
],
|
||||
);
|
||||
}
|
||||
@@ -99,10 +99,9 @@ class TenderCard extends StatelessWidget {
|
||||
SizedBox(height: 12.0.h()),
|
||||
|
||||
// Title
|
||||
Text(
|
||||
SelectableText(
|
||||
tender.title!,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
color: AppColors.grey80,
|
||||
fontSize: 16.0.sp(),
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:tm_app/data/services/model/tender_submission/tender_submission.dart';
|
||||
|
||||
void main() {
|
||||
group('TenderSubmissionsResponse', () {
|
||||
test('parses root pagination metadata and a reduced tender payload', () {
|
||||
final response = TenderSubmissionsResponse.fromJson({
|
||||
'success': true,
|
||||
'message': 'Tender submissions retrieved successfully',
|
||||
'data': [
|
||||
{
|
||||
'id': 'submission-1',
|
||||
'tender_id': 'tender-1',
|
||||
'company_id': 'company-1',
|
||||
'customer_id': 'customer-1',
|
||||
'status': 'validating',
|
||||
'stage': 'in_progress',
|
||||
'created_at': 1710000000,
|
||||
'updated_at': 1710003600,
|
||||
'status_history': [
|
||||
{
|
||||
'status': 'validating',
|
||||
'changed_at': 1710003600,
|
||||
'description': 'User accepted tender',
|
||||
},
|
||||
],
|
||||
'tender': {
|
||||
'id': 'tender-1',
|
||||
'title': 'IT Infrastructure Services',
|
||||
'description': 'A reduced tender payload',
|
||||
'submission_deadline': 1714000000,
|
||||
'country_code': 'DE',
|
||||
'status': 'active',
|
||||
},
|
||||
},
|
||||
],
|
||||
'meta': {
|
||||
'total': 42,
|
||||
'limit': 20,
|
||||
'offset': 0,
|
||||
'page': 1,
|
||||
'pages': 3,
|
||||
'has_more': true,
|
||||
},
|
||||
});
|
||||
|
||||
expect(response.success, isTrue);
|
||||
expect(response.data, hasLength(1));
|
||||
expect(response.data.single.status, 'validating');
|
||||
expect(response.data.single.stage, 'in_progress');
|
||||
expect(response.data.single.tender?.title, 'IT Infrastructure Services');
|
||||
expect(response.data.single.statusHistory.single.changedAt, 1710003600);
|
||||
expect(response.meta?.total, 42);
|
||||
expect(response.meta?.hasMore, isTrue);
|
||||
});
|
||||
|
||||
test('keeps a submission when its tender is null', () {
|
||||
final response = TenderSubmissionResponse.fromJson({
|
||||
'success': true,
|
||||
'data': {
|
||||
'id': 'submission-2',
|
||||
'tender_id': 'tender-2',
|
||||
'status': 'not_applied',
|
||||
'stage': 'not_applied',
|
||||
'tender': null,
|
||||
},
|
||||
});
|
||||
|
||||
expect(response.data?.tender, isNull);
|
||||
expect(response.data?.isTerminal, isTrue);
|
||||
});
|
||||
});
|
||||
|
||||
test('parses company stats maps', () {
|
||||
final response = TenderSubmissionStatsResponse.fromJson({
|
||||
'success': true,
|
||||
'data': {
|
||||
'company_id': 'company-1',
|
||||
'total': 15,
|
||||
'by_stage': {'opportunity': 3, 'in_progress': 5},
|
||||
'by_status': {'validating': 2, 'contract': 2},
|
||||
'last_updated': 1710003600,
|
||||
},
|
||||
});
|
||||
|
||||
expect(response.data?.total, 15);
|
||||
expect(response.data?.byStage['in_progress'], 5);
|
||||
expect(response.data?.byStatus['contract'], 2);
|
||||
});
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import 'package:tm_app/core/network/app_exceptions.dart';
|
||||
import 'package:tm_app/core/network/network_manager.dart';
|
||||
import 'package:tm_app/core/utils/result.dart';
|
||||
import 'package:tm_app/data/repositories/company_ai_repository.dart';
|
||||
@@ -8,79 +7,82 @@ import 'package:tm_app/data/repositories/home_repository.dart';
|
||||
import 'package:tm_app/data/services/company_ai_service.dart';
|
||||
import 'package:tm_app/data/services/home_service.dart';
|
||||
import 'package:tm_app/data/services/liked_tenders_service.dart';
|
||||
import 'package:tm_app/data/services/model/recommend_response/recommend_response.dart';
|
||||
import 'package:tm_app/data/services/model/recommendation_item/recommendation_item.dart';
|
||||
import 'package:tm_app/data/services/model/recommended_tenders_data/recommended_tenders_data.dart';
|
||||
import 'package:tm_app/data/services/model/recommended_tenders_response/recommended_tenders_response.dart';
|
||||
import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
|
||||
import 'package:tm_app/data/services/your_tenders_service.dart';
|
||||
import 'package:tm_app/data/services/tender_submissions_service.dart';
|
||||
import 'package:tm_app/view_models/ai_recommendations_view_model.dart';
|
||||
|
||||
void main() {
|
||||
group('AiRecommendationsViewModel', () {
|
||||
test('falls back to legacy recommendations on HTTP 503', () async {
|
||||
test(
|
||||
'loads recommended tenders from GET /api/v1/tenders/recommend',
|
||||
() async {
|
||||
final prefs = await _prefs();
|
||||
final companyRepository = _FakeCompanyAiRepository(
|
||||
prefs,
|
||||
results: [Result.error(ServerException('unavailable', 503))],
|
||||
);
|
||||
final homeRepository = _FakeHomeRepository(
|
||||
prefs,
|
||||
result: const Result.ok(
|
||||
result: Result.ok(
|
||||
RecommendedTendersResponse(
|
||||
succes: true,
|
||||
success: true,
|
||||
message: 'ok',
|
||||
error: null,
|
||||
data: RecommendedTendersData(tenders: [], metadata: null),
|
||||
data: RecommendedTendersData(
|
||||
tenders: [
|
||||
_sampleTender(id: 'tender-1', title: 'Bridge repair'),
|
||||
],
|
||||
metadata: null,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
final viewModel = AiRecommendationsViewModel(
|
||||
companyAiRepository: companyRepository,
|
||||
companyAiRepository: _FakeCompanyAiRepository(prefs),
|
||||
homeRepository: homeRepository,
|
||||
);
|
||||
|
||||
await viewModel.loadRecommendations();
|
||||
|
||||
expect(viewModel.hasLoaded, isTrue);
|
||||
expect(viewModel.usingFallback, isTrue);
|
||||
expect(viewModel.errorMessage, isNull);
|
||||
expect(homeRepository.recommendedTendersCalls, 1);
|
||||
});
|
||||
expect(viewModel.recommendedTenders.single.id, 'tender-1');
|
||||
},
|
||||
);
|
||||
|
||||
test('keeps failed transient loads retryable for loadIfNeeded', () async {
|
||||
final prefs = await _prefs();
|
||||
final companyRepository = _FakeCompanyAiRepository(
|
||||
final homeRepository = _FakeHomeRepository(
|
||||
prefs,
|
||||
results: [
|
||||
Result.error(FetchDataException('network failed')),
|
||||
const Result.ok(
|
||||
RecommendResponse(
|
||||
data: [
|
||||
RecommendationItem(
|
||||
rank: '1',
|
||||
tenderId: 'tender-1',
|
||||
analysis: 'Strong match',
|
||||
),
|
||||
],
|
||||
error: null,
|
||||
message: 'ok',
|
||||
Result.error(Exception('network failed')),
|
||||
Result.ok(
|
||||
RecommendedTendersResponse(
|
||||
success: true,
|
||||
message: 'ok',
|
||||
error: null,
|
||||
data: RecommendedTendersData(
|
||||
tenders: [
|
||||
_sampleTender(id: 'tender-1', title: 'Bridge repair'),
|
||||
],
|
||||
metadata: null,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
final viewModel = AiRecommendationsViewModel(
|
||||
companyAiRepository: companyRepository,
|
||||
homeRepository: _FakeHomeRepository(prefs),
|
||||
companyAiRepository: _FakeCompanyAiRepository(prefs),
|
||||
homeRepository: homeRepository,
|
||||
);
|
||||
|
||||
await viewModel.loadRecommendations();
|
||||
await viewModel.loadIfNeeded();
|
||||
|
||||
expect(companyRepository.recommendationCalls, 2);
|
||||
expect(homeRepository.recommendedTendersCalls, 2);
|
||||
expect(viewModel.hasLoaded, isTrue);
|
||||
expect(viewModel.errorMessage, isNull);
|
||||
expect(viewModel.items.single.tenderId, 'tender-1');
|
||||
expect(viewModel.recommendedTenders.single.id, 'tender-1');
|
||||
});
|
||||
|
||||
test(
|
||||
@@ -91,16 +93,6 @@ void main() {
|
||||
companyAiRepository: _FakeCompanyAiRepository(
|
||||
prefs,
|
||||
lastOnboardingStartedAt: DateTime.now().millisecondsSinceEpoch,
|
||||
results: [
|
||||
const Result.ok(
|
||||
RecommendResponse(
|
||||
data: [],
|
||||
error: null,
|
||||
message: 'ok',
|
||||
success: true,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
homeRepository: _FakeHomeRepository(prefs),
|
||||
);
|
||||
@@ -123,22 +115,11 @@ Future<SharedPreferences> _prefs() async {
|
||||
class _FakeCompanyAiRepository extends CompanyAiRepository {
|
||||
_FakeCompanyAiRepository(
|
||||
SharedPreferences prefs, {
|
||||
required List<Result<RecommendResponse>> results,
|
||||
int? lastOnboardingStartedAt,
|
||||
}) : _results = results,
|
||||
_lastOnboardingStartedAt = lastOnboardingStartedAt,
|
||||
}) : _lastOnboardingStartedAt = lastOnboardingStartedAt,
|
||||
super(companyAiService: _UnusedCompanyAiService(prefs), prefs: prefs);
|
||||
|
||||
final List<Result<RecommendResponse>> _results;
|
||||
final int? _lastOnboardingStartedAt;
|
||||
int recommendationCalls = 0;
|
||||
|
||||
@override
|
||||
Future<Result<RecommendResponse>> getRecommendations() async {
|
||||
final index = recommendationCalls;
|
||||
recommendationCalls += 1;
|
||||
return _results[index];
|
||||
}
|
||||
|
||||
@override
|
||||
int? lastOnboardingStartedAt() => _lastOnboardingStartedAt;
|
||||
@@ -147,15 +128,22 @@ class _FakeCompanyAiRepository extends CompanyAiRepository {
|
||||
class _FakeHomeRepository extends HomeRepository {
|
||||
_FakeHomeRepository(
|
||||
SharedPreferences prefs, {
|
||||
this.result = const Result.ok(
|
||||
List<Result<RecommendedTendersResponse>>? results,
|
||||
Result<RecommendedTendersResponse>? result,
|
||||
}) : _results =
|
||||
results ??
|
||||
[
|
||||
result ??
|
||||
const Result.ok(
|
||||
RecommendedTendersResponse(
|
||||
succes: true,
|
||||
success: true,
|
||||
message: 'ok',
|
||||
error: null,
|
||||
data: RecommendedTendersData(tenders: [], metadata: null),
|
||||
),
|
||||
),
|
||||
}) : super(
|
||||
],
|
||||
super(
|
||||
homeService: HomeService(networkManager: NetworkManager(prefs)),
|
||||
yourTendersService: YourTendersService(
|
||||
networkManager: NetworkManager(prefs),
|
||||
@@ -163,9 +151,12 @@ class _FakeHomeRepository extends HomeRepository {
|
||||
likedTendersService: LikedTendersService(
|
||||
networkManager: NetworkManager(prefs),
|
||||
),
|
||||
tenderSubmissionsService: TenderSubmissionsService(
|
||||
networkManager: NetworkManager(prefs),
|
||||
),
|
||||
);
|
||||
|
||||
final Result<RecommendedTendersResponse> result;
|
||||
final List<Result<RecommendedTendersResponse>> _results;
|
||||
int recommendedTendersCalls = 0;
|
||||
|
||||
@override
|
||||
@@ -173,8 +164,9 @@ class _FakeHomeRepository extends HomeRepository {
|
||||
required int limit,
|
||||
required int offset,
|
||||
}) async {
|
||||
final index = recommendedTendersCalls;
|
||||
recommendedTendersCalls += 1;
|
||||
return result;
|
||||
return _results[index];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -182,3 +174,36 @@ class _UnusedCompanyAiService extends CompanyAiService {
|
||||
_UnusedCompanyAiService(SharedPreferences prefs)
|
||||
: super(networkManager: NetworkManager(prefs));
|
||||
}
|
||||
|
||||
TenderData _sampleTender({required String id, required String title}) {
|
||||
return TenderData(
|
||||
success: null,
|
||||
message: null,
|
||||
id: id,
|
||||
tenderId: id,
|
||||
noticePublicationId: null,
|
||||
noticeTypeCode: null,
|
||||
formType: null,
|
||||
noticeLanguageCode: null,
|
||||
issueDate: null,
|
||||
issueTime: null,
|
||||
publicationDate: null,
|
||||
title: title,
|
||||
description: null,
|
||||
procurementTypeCode: null,
|
||||
procedureCode: null,
|
||||
estimatedValue: null,
|
||||
currency: null,
|
||||
duration: null,
|
||||
tenderDeadline: null,
|
||||
submissionDeadline: null,
|
||||
applicationDeadline: null,
|
||||
submissionUrl: null,
|
||||
countryCode: null,
|
||||
durationUnit: null,
|
||||
buyerOrganization: null,
|
||||
lots: null,
|
||||
officialLanguages: null,
|
||||
status: null,
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user