Skip to content

Commit 57eb703

Browse files
SamR1SamR1
committed
Client - add informations in user preferences
1 parent c979e1f commit 57eb703

File tree

7 files changed

+58
-13
lines changed

7 files changed

+58
-13
lines changed

‎fittrackee_client/src/components/User/ProfileDisplay/UserPreferences.vue‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
)
6969
}}
7070
</dd>
71-
<dt>{{ $t('user.PROFILE.USE_RAW_GPX_SPEED.LABEL') }}:</dt>
71+
<dt>{{ $t('user.PROFILE.USE_RAW_GPX_SPEED.LABEL') }}<sup>1</sup>:</dt>
7272
<dd>
7373
{{
7474
$t(
@@ -86,7 +86,10 @@
8686
</div>
8787
</dl>
8888
<dl>
89-
<dt>{{ $t('user.PROFILE.MISSING_ELEVATIONS_PROCESSING_LABEL') }}:</dt>
89+
<dt>
90+
{{ $t('user.PROFILE.MISSING_ELEVATIONS_PROCESSING_LABEL')
91+
}}<sup>1</sup>:
92+
</dt>
9093
<dd>
9194
{{
9295
$t(
@@ -105,23 +108,25 @@
105108
{{ $t('user.PROFILE.NO_ELEVATION_SERVICE_AVAILABLE') }}
106109
</span>
107110
</div>
108-
<dt>{{ $t('visibility_levels.WORKOUTS_VISIBILITY') }}:</dt>
111+
<dt>{{ $t('visibility_levels.WORKOUTS_VISIBILITY') }}<sup>2</sup>:</dt>
109112
<dd>
110113
{{ $t(`visibility_levels.LEVELS.${user.workouts_visibility}`) }}
111114
</dd>
112-
<dt>{{ $t('visibility_levels.ANALYSIS_VISIBILITY') }}:</dt>
115+
<dt>{{ $t('visibility_levels.ANALYSIS_VISIBILITY') }}<sup>2</sup>:</dt>
113116
<dd>
114117
{{ $t(`visibility_levels.LEVELS.${user.analysis_visibility}`) }}
115118
</dd>
116-
<dt>{{ $t('visibility_levels.MAP_VISIBILITY') }}:</dt>
119+
<dt>{{ $t('visibility_levels.MAP_VISIBILITY') }}<sup>2</sup>:</dt>
117120
<dd>
118121
{{ $t(`visibility_levels.LEVELS.${user.map_visibility}`) }}
119122
</dd>
120123
<dt>{{ $t('visibility_levels.HR_VISIBILITY') }}:</dt>
121124
<dd>
122125
{{ $t(`visibility_levels.LEVELS.${user.hr_visibility}`) }}
123126
</dd>
124-
<dt>{{ $t('user.PROFILE.SEGMENTS_CREATION_EVENT.LABEL') }}:</dt>
127+
<dt>
128+
{{ $t('user.PROFILE.SEGMENTS_CREATION_EVENT.LABEL') }}<sup>1</sup>:
129+
</dt>
125130
<dd>
126131
{{
127132
$t(
@@ -130,6 +135,12 @@
130135
}}
131136
</dd>
132137
</dl>
138+
<div class="info-box changes-help">
139+
<div>
140+
1. {{ $t('user.PROFILE.CHANGES_ONLY_TO_NEW_OR_REFRESHED_WORKOUTS') }}
141+
</div>
142+
<div>2. {{ $t('user.PROFILE.CHANGES_ONLY_TO_NEW_WORKOUTS') }}</div>
143+
</div>
133144
<div class="profile-buttons">
134145
<button @click="$router.push('/profile/edit/preferences')">
135146
{{ $t('user.PROFILE.EDIT_PREFERENCES') }}
@@ -188,6 +199,7 @@
188199
.missing-elevations-help {
189200
margin-top: -$default-margin * 0.5;
190201
}
202+
.changes-help,
191203
.missing-elevations-help {
192204
margin-bottom: $default-margin;
193205
}

‎fittrackee_client/src/components/User/ProfileEdition/UserPreferencesEdition.vue‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
</div>
228228
<div class="form-items form-checkboxes">
229229
<span class="checkboxes-label">
230-
{{ $t('user.PROFILE.USE_RAW_GPX_SPEED.LABEL') }}
230+
{{ $t('user.PROFILE.USE_RAW_GPX_SPEED.LABEL') }}<sup>1</sup>
231231
</span>
232232
<div class="checkboxes">
233233
<label v-for="status in useRawGpxSpeed" :key="status.label">
@@ -252,7 +252,10 @@
252252
</div>
253253
</div>
254254
<label class="form-items">
255-
{{ $t('user.PROFILE.MISSING_ELEVATIONS_PROCESSING_LABEL') }}
255+
<span>
256+
{{ $t('user.PROFILE.MISSING_ELEVATIONS_PROCESSING_LABEL')
257+
}}<sup>1</sup>
258+
</span>
256259
<select
257260
id="missing_elevations_processing"
258261
v-model="userForm.missing_elevations_processing"
@@ -279,7 +282,9 @@
279282
</span>
280283
</div>
281284
<label class="form-items">
282-
{{ $t('visibility_levels.WORKOUTS_VISIBILITY') }}
285+
<span>
286+
{{ $t('visibility_levels.WORKOUTS_VISIBILITY') }}<sup>2</sup>
287+
</span>
283288
<select
284289
id="workouts_visibility"
285290
v-model="userForm.workouts_visibility"
@@ -296,7 +301,9 @@
296301
</select>
297302
</label>
298303
<label class="form-items">
299-
{{ $t('visibility_levels.ANALYSIS_VISIBILITY') }}
304+
<span>
305+
{{ $t('visibility_levels.ANALYSIS_VISIBILITY') }}<sup>2</sup>
306+
</span>
300307
<select
301308
id="analysis_visibility"
302309
v-model="userForm.analysis_visibility"
@@ -313,7 +320,9 @@
313320
</select>
314321
</label>
315322
<label class="form-items">
316-
{{ $t('visibility_levels.MAP_VISIBILITY') }}
323+
<span>
324+
{{ $t('visibility_levels.MAP_VISIBILITY') }}<sup>2</sup>
325+
</span>
317326
<select
318327
id="map_visibility"
319328
v-model="userForm.map_visibility"
@@ -345,7 +354,9 @@
345354
</select>
346355
</label>
347356
<label class="form-items">
348-
{{ $t('user.PROFILE.SEGMENTS_CREATION_EVENT.LABEL') }}
357+
<span>
358+
{{ $t('user.PROFILE.SEGMENTS_CREATION_EVENT.LABEL') }}<sup>1</sup>
359+
</span>
349360
<select
350361
id="segments_creation_event"
351362
v-model="userForm.segments_creation_event"
@@ -360,6 +371,13 @@
360371
</option>
361372
</select>
362373
</label>
374+
<div class="info-box changes-help">
375+
<div>
376+
1.
377+
{{ $t('user.PROFILE.CHANGES_ONLY_TO_NEW_OR_REFRESHED_WORKOUTS') }}
378+
</div>
379+
<div>2. {{ $t('user.PROFILE.CHANGES_ONLY_TO_NEW_WORKOUTS') }}</div>
380+
</div>
363381
<div class="form-buttons">
364382
<button class="confirm" type="submit">
365383
{{ $t('buttons.SUBMIT') }}
@@ -654,5 +672,9 @@
654672
.missing-elevations-help {
655673
margin-top: $default-margin * 0.5;
656674
}
675+
.changes-help {
676+
margin-top: $default-margin * 2.5;
677+
margin-bottom: -$default-margin;
678+
}
657679
}
658680
</style>

‎fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutChart/index.vue‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
$t(`workouts.MISSING_ELEVATIONS_PROCESSING.${elevationsSource}`)
8282
}}
8383
</span>
84-
<span v-else-if="authUser.username">
84+
<span v-else-if="isWorkoutOwner">
8585
{{ $t('workouts.NO_DATA_CLEANING') }}
8686
</span>
8787
</div>
@@ -136,6 +136,7 @@
136136
authUser: IAuthUserProfile
137137
workoutData: IWorkoutData
138138
sport: ISport | null
139+
isWorkoutOwner: boolean
139140
}
140141
const props = defineProps<Props>()
141142
const { authUser, sport, workoutData } = toRefs(props)

‎fittrackee_client/src/locales/en/user.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@
7171
"PRIVACY_POLICY_TO_VALIDATE": "Please {0} the privacy policy before proceeding.",
7272
"PROFILE": {
7373
"ACCOUNT_EDITION": "Account edition",
74+
"CHANGES_ONLY_TO_NEW_OR_REFRESHED_WORKOUTS": "The changes apply only to new or refreshed workouts.",
75+
"CHANGES_ONLY_TO_NEW_WORKOUTS": "The changes apply only to new workouts.",
7476
"ARCHIVE_UPLOADS": {
7577
"ARCHIVE": "Zip archive",
7678
"CONFIRM_TASK_ABORT": "Are you sure you want to abort this archive upload task?",

‎fittrackee_client/src/locales/fr/user.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@
8585
"BACK_TO_PROFILE": "Revenir au profil",
8686
"BIO": "Bio",
8787
"BIRTH_DATE": "Date de naissance",
88+
89+
"CHANGES_ONLY_TO_NEW_OR_REFRESHED_WORKOUTS": "Les changements ne s'appliquent seulement aux nouvelles séances ou aux séances actualisées.",
90+
"CHANGES_ONLY_TO_NEW_WORKOUTS": "Les changements ne s'appliquent seulement aux nouvelles séances.",
8891
"CREATED_REPORTS": "Signalements créés",
8992
"DATE_FORMAT": "Format d'affichage de la date",
9093
"EDIT": "Modifier le profil",

‎fittrackee_client/src/scss/base.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ body {
4646
min-height: 100vh;
4747
}
4848

49+
sup {
50+
font-size: 0.65em;
51+
}
52+
4953
a {
5054
color: var(--app-a-color);
5155
text-decoration-color: var(--app-a-text-decoration-color);

‎fittrackee_client/src/views/workouts/Workout.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
:displaySegment="displaySegment"
2828
:sport="sport"
2929
:cadenceUnit="cadenceUnit"
30+
:isWorkoutOwner="isWorkoutOwner"
3031
@getCoordinates="updateCoordinates"
3132
/>
3233
<WorkoutContent

0 commit comments

Comments
 (0)