forked from eatvio/eatvio_app
Merge branch 'issue-1122' of ssh://10.55.5.123:222/misha/eatvio_app into issue-1122
This commit is contained in:
@@ -20,7 +20,9 @@ import 'package:eatvio_app/features/diary/presentation/widgets/day_comment_widge
|
||||
import 'package:eatvio_app/features/diary/presentation/widgets/finish_day_button_widget.dart';
|
||||
import 'package:eatvio_app/features/diary/presentation/widgets/meal_widget.dart';
|
||||
import 'package:eatvio_app/features/diary/presentation/widgets/wakeup_and_retire_widget.dart';
|
||||
import 'package:eatvio_app/features/insights/presentation/widgets/insights_card.dart';
|
||||
import 'package:eatvio_app/generated/l10n.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:material_ui/material_ui.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
@@ -36,18 +38,27 @@ class DiaryScreen extends StatelessWidget {
|
||||
class UserDiaryScreen extends StatelessWidget {
|
||||
static const path = '/user-diary-screen';
|
||||
static const name = 'userDiaryScreen';
|
||||
const UserDiaryScreen({super.key, required this.diaryId});
|
||||
const UserDiaryScreen({super.key, required this.diaryId, this.ownerSlug});
|
||||
final int diaryId;
|
||||
|
||||
/// Slug владельца дневника (клиента) — нужен консультанту для блока «Аналитика».
|
||||
final String? ownerSlug;
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return DiaryScreenContent(diaryId: diaryId);
|
||||
return DiaryScreenContent(diaryId: diaryId, ownerSlug: ownerSlug);
|
||||
}
|
||||
}
|
||||
|
||||
class DiaryScreenContent extends StatefulWidget {
|
||||
const DiaryScreenContent({super.key, this.diaryId, this.date});
|
||||
const DiaryScreenContent({
|
||||
super.key,
|
||||
this.diaryId,
|
||||
this.date,
|
||||
this.ownerSlug,
|
||||
});
|
||||
final int? diaryId;
|
||||
final DateTime? date;
|
||||
final String? ownerSlug;
|
||||
@override
|
||||
State<DiaryScreenContent> createState() => _DiaryScreenContentState();
|
||||
}
|
||||
@@ -55,6 +66,16 @@ class DiaryScreenContent extends StatefulWidget {
|
||||
class _DiaryScreenContentState extends State<DiaryScreenContent> {
|
||||
bool _isDiaryFinishing = false;
|
||||
|
||||
/// Slug владельца: из `user.slug` дневника, иначе из параметра экрана.
|
||||
String? _ownerSlug(DiaryStateLoaded state) {
|
||||
return state.diary.ownerSlug ?? widget.ownerSlug;
|
||||
}
|
||||
|
||||
/// Консультант видит аналитику клиента только при известном slug владельца.
|
||||
bool _canShowInsights(DiaryStateLoaded state) {
|
||||
return !state.isConsultantView || _ownerSlug(state) != null;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final s = S.of(context);
|
||||
@@ -110,6 +131,15 @@ class _DiaryScreenContentState extends State<DiaryScreenContent> {
|
||||
const SizedBox(height: 60),
|
||||
const Loader(),
|
||||
],
|
||||
if (state is DiaryStateLoaded && _canShowInsights(state))
|
||||
Padding(
|
||||
padding: const EdgeInsets.fromLTRB(4, 12, 4, 12),
|
||||
child: _DiaryInsights(
|
||||
slug: state.isConsultantView ? _ownerSlug(state) : null,
|
||||
canAdd: !state.isConsultantView,
|
||||
diaryDate: state.diary.date,
|
||||
),
|
||||
),
|
||||
if (state is DiaryStateLoaded)
|
||||
WakeupAndRetireWidget(
|
||||
isEnabled:
|
||||
@@ -249,3 +279,53 @@ class _DiaryScreenContentState extends State<DiaryScreenContent> {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Блок «Аналитика» в дневнике. Для своего дневника перезапрашивает данные,
|
||||
/// когда в том же дне меняются приёмы пищи или время подъёма/отбоя: от них
|
||||
/// зависят КБЖУ-графики. Чужой дневник консультант не редактирует.
|
||||
class _DiaryInsights extends StatefulWidget {
|
||||
const _DiaryInsights({
|
||||
required this.slug,
|
||||
required this.canAdd,
|
||||
required this.diaryDate,
|
||||
});
|
||||
|
||||
final String? slug;
|
||||
final bool canAdd;
|
||||
|
||||
/// Дата открытого дня дневника (`YYYY-MM-DD`) — стартовый день «В течение дня».
|
||||
final String diaryDate;
|
||||
|
||||
@override
|
||||
State<_DiaryInsights> createState() => _DiaryInsightsState();
|
||||
}
|
||||
|
||||
class _DiaryInsightsState extends State<_DiaryInsights> {
|
||||
int _refreshToken = 0;
|
||||
|
||||
bool _isOwnDiaryMutation(DiaryState previous, DiaryState current) {
|
||||
if (!widget.canAdd ||
|
||||
previous is! DiaryStateLoaded ||
|
||||
current is! DiaryStateLoaded ||
|
||||
previous.diary.id != current.diary.id) {
|
||||
return false;
|
||||
}
|
||||
return !listEquals(previous.diary.meals, current.diary.meals) ||
|
||||
previous.diary.wakeup != current.diary.wakeup ||
|
||||
previous.diary.retire != current.diary.retire;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BlocListener<DiaryCubit, DiaryState>(
|
||||
listenWhen: _isOwnDiaryMutation,
|
||||
listener: (context, state) => setState(() => _refreshToken++),
|
||||
child: InsightsCard(
|
||||
slug: widget.slug,
|
||||
canAdd: widget.canAdd,
|
||||
refreshToken: _refreshToken,
|
||||
initialIntraDate: widget.diaryDate,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user