poignatov/play-life
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.13.0: Переменные $name и $subtaskName в сообщениях награды
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 1m19s
Details

Browse Source
This commit is contained in:
poignatov
2026-03-12 15:28:25 +03:00
parent 02c8b7537a
commit 0b5106458a
5 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
play-life-web/src/components/TaskDetail.jsx
View File

@@ -291,7 +291,7 @@ const formatTelegramMessage = (task, rewards, subtasks, selectedSubtasks, progre
})
// Функция для замены плейсхолдеров
const replacePlaceholders = (message, rewardStrings) => {
const replacePlaceholders = (message, rewardStrings, taskName, subtaskName) => {
let result = message
// Сначала защищаем экранированные плейсхолдеры
const escapedMarkers = {}
@@ -303,6 +303,12 @@ const formatTelegramMessage = (task, rewards, subtasks, selectedSubtasks, progre
result = result.replace(new RegExp(escaped.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), marker)
}
}
// Заменяем $subtaskName именем подзадачи (если задано)
if (subtaskName) {
result = result.replace(/\$subtaskName/g, subtaskName)
}
// Заменяем $name именем задачи
result = result.replace(/\$name/g, taskName || '')
// Заменяем ${0}, ${1}, и т.д.
for (let i = 0; i < 100; i++) {
const placeholder = `\${${i}}`
@@ -327,7 +333,7 @@ const formatTelegramMessage = (task, rewards, subtasks, selectedSubtasks, progre
// Формируем сообщение основной задачи
let mainTaskMessage = task.reward_message && task.reward_message.trim() !== ''
? replacePlaceholders(task.reward_message, rewardStrings)
? replacePlaceholders(task.reward_message, rewardStrings, task.name)
: task.name
// Формируем сообщения подзадач
@@ -361,7 +367,7 @@ const formatTelegramMessage = (task, rewards, subtasks, selectedSubtasks, progre
subtaskRewardStrings[reward.position] = scoreStr
})
const subtaskMessage = replacePlaceholders(subtask.task.reward_message, subtaskRewardStrings)
const subtaskMessage = replacePlaceholders(subtask.task.reward_message, subtaskRewardStrings, task.name, subtask.task.name)
subtaskMessages.push(subtaskMessage)
})

16
play-life-web/src/components/TaskForm.jsx
View File

@@ -12,7 +12,7 @@ function TaskForm({ onNavigate, taskId, wishlistId, returnTo, returnWishlistId }
const { authFetch } = useAuth()
const [name, setName] = useState('')
const [progressionBase, setProgressionBase] = useState('')
const [rewardMessage, setRewardMessage] = useState('')
const [rewardMessage, setRewardMessage] = useState('$name')
const [repetitionPeriodValue, setRepetitionPeriodValue] = useState('')
const [repetitionPeriodType, setRepetitionPeriodType] = useState('day')
const [repetitionMode, setRepetitionMode] = useState('after') // 'after' = Через, 'each' = Каждое
@@ -108,7 +108,7 @@ function TaskForm({ onNavigate, taskId, wishlistId, returnTo, returnWishlistId }
// Функция сброса формы
const resetForm = () => {
setName('')
setRewardMessage('')
setRewardMessage('$name')
setProgressionBase('')
setRepetitionPeriodValue('')
setRepetitionPeriodType('day')
@@ -156,7 +156,7 @@ function TaskForm({ onNavigate, taskId, wishlistId, returnTo, returnWishlistId }
}
// Предзаполняем сообщение награды
if (data.name) {
setRewardMessage(`Выполнить желание: ${data.name}`)
setRewardMessage('Выполнить желание: $name')
}
}
} catch (err) {
@@ -181,7 +181,7 @@ function TaskForm({ onNavigate, taskId, wishlistId, returnTo, returnWishlistId }
}
const data = await response.json()
setName(data.task.name)
setRewardMessage(data.task.reward_message || '')
setRewardMessage(data.task.reward_message || '$name')
setProgressionBase(data.task.progression_base ? String(data.task.progression_base) : '')
setGroupName(data.task.group_name ?? '')
@@ -359,7 +359,7 @@ function TaskForm({ onNavigate, taskId, wishlistId, returnTo, returnWishlistId }
setSubtasks(data.subtasks.map((st, index) => ({
id: st.task.id,
name: st.task.name || '',
reward_message: st.task.reward_message || '',
reward_message: st.task.reward_message || '$subtaskName',
position: st.task.position !== undefined && st.task.position !== null ? st.task.position : index,
rewards: st.rewards.map(r => ({
position: r.position,
@@ -539,7 +539,7 @@ function TaskForm({ onNavigate, taskId, wishlistId, returnTo, returnWishlistId }
setSubtasks([...subtasks, {
id: null,
name: '',
reward_message: '',
reward_message: '$subtaskName',
position: subtasks.length,
rewards: []
}])
@@ -1018,7 +1018,7 @@ function TaskForm({ onNavigate, taskId, wishlistId, returnTo, returnWishlistId }
<textarea
value={subtask.reward_message}
onChange={(e) => handleSubtaskRewardMessageChange(index, e.target.value)}
placeholder="Сообщение награды (опционально)"
placeholder="Используйте $subtaskName для имени подзадачи, $name для имени задачи"
className="form-textarea"
rows={2}
/>
@@ -1335,7 +1335,7 @@ function TaskForm({ onNavigate, taskId, wishlistId, returnTo, returnWishlistId }
id="reward_message"
value={rewardMessage}
onChange={(e) => setRewardMessage(e.target.value)}
placeholder="Используйте ${0}, $0 для указания проектов (\\$0 для экранирования)"
placeholder="Используйте $name для имени задачи, ${0}, $0 для проектов (\\$0 для экранирования)"
className="form-textarea"
rows={3}
/>