rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-28 09:24:24 +01:00
Code Issues Releases Activity

Merge branch 'dev' for release 6.3.28

Browse Source
This commit is contained in:
Du Peng 2024-07-05 14:35:37 +02:00
commit 3af76b9dca
22 changed files with 68 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -2,6 +2,12 @@
## Next release
## v6.3.28 2024 July 5
- Fix a bug: unable to show gender in global export
- updates translations
- [TODO DEPLOY] `rails fablab:maintenance:regenerate_statistics[2014,1]`
## v6.3.27 2024 June 12
- Fix a bug: unable to show gender wowan in member export

2
app/frontend/images/icons.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

3
app/frontend/src/stylesheets/app.buttons.scss
View File

@ -33,6 +33,9 @@
}
.btn-twitter {
display: inline-flex;
align-items: center;
gap: 1rem;
border: 1px solid #ccd6dd;
background-color: #55acee;
color: white;

3
app/frontend/src/stylesheets/app.components.scss
View File

@ -28,6 +28,9 @@
}
a {
display: inline-flex;
align-items: center;
gap: 1rem;
color: $black-light;
&:hover {

3
app/frontend/templates/admin/settings/home_page.html
View File

@ -30,8 +30,7 @@
<text-setting name="twitter_name"
settings="allSettings"
required="false"
label="app.admin.settings.twitter_stream"
fa-icon="fa-twitter">
label="app.admin.settings.twitter_stream">
</text-setting>
</div>
</div>

7
app/frontend/templates/events/show.html
View File

@ -42,7 +42,12 @@
<div class="text-center" id="social-share">
<a ng-href="{{shareOnFacebook()}}" target="_blank" class="btn btn-facebook btn-lg m-t"><i class="fa fa-facebook m-r"></i> {{ 'app.public.events_show.share_on_facebook' | translate }}</a>
<a ng-href="{{shareOnTwitter()}}" target="_blank" class="btn btn-twitter btn-lg m-t"><i class="fa fa-twitter m-r"></i> {{ 'app.public.events_show.share_on_twitter' | translate }}</a>
<a ng-href="{{shareOnTwitter()}}" target="_blank" class="btn btn-twitter btn-lg m-t">
<svg viewBox="0 0 24 24" width="20px">
<use href="../../images/icons.svg#twitter"/>
</svg>
{{ 'app.public.events_show.share_on_twitter' | translate }}
</a>
</div>
</div>

10
app/frontend/templates/home/twitter.html
View File

@ -1,11 +1,11 @@
<section class="widget panel b-a m-t-sm" ng-show="twitterName">
<div class="panel-heading b-b small">
<div class="pull-right text-xs align">
<a href="https://twitter.com/{{ twitterName }}" target="_blank">{{ 'app.public.home.follow_us' | translate }}
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x text-yellow"></i>
<i class="fa fa-twitter fa-stack-1x fa-inverse text-white"></i>
</span>
<a href="https://twitter.com/{{ twitterName }}" target="_blank">
{{ 'app.public.home.follow_us' | translate }}
<svg viewBox="0 0 24 24" width="32px">
<use href="../../images/icons.svg#twitter"/>
</svg>
</a>
</div>
<h2 translate>{{ 'app.public.home.latest_tweets' }}</h2>

7
app/frontend/templates/projects/show.html
View File

@ -59,7 +59,12 @@
<div class="text-center" id="social-share">
<a ng-href="{{shareOnFacebook()}}" target="_blank" class="btn btn-facebook btn-lg m-t"><i class="fa fa-facebook m-r"></i> {{ 'app.public.projects_show.share_on_facebook' | translate }}</a>
<a ng-href="{{shareOnTwitter()}}" target="_blank" class="btn btn-twitter btn-lg m-t"><i class="fa fa-twitter m-r"></i> {{ 'app.public.projects_show.share_on_twitter' | translate }}</a>
<a ng-href="{{shareOnTwitter()}}" target="_blank" class="btn btn-twitter btn-lg m-t">
<svg viewBox="0 0 24 24" width="20px">
<use href="../../images/icons.svg#twitter"/>
</svg>
{{ 'app.public.projects_show.share_on_twitter' | translate }}
</a>
</div>
<div class="wrapper-lg" ng-if="disqusShortname">

2
app/helpers/excel_helper.rb
View File

@ -31,7 +31,7 @@ module ExcelHelper
user&.profile&.full_name || t('export.deleted_user'),
user&.email || '',
user&.profile&.phone || '',
hit['_source']['gender'].nil? ? t("export.#{hit['_source']['gender']}") : '',
!hit['_source']['gender'].nil? ? t("export.#{hit['_source']['gender']}") : '',
hit['_source']['age'],
subtype.nil? ? '' : subtype.label
]

2
app/models/statistic_profile.rb
View File

@ -31,7 +31,7 @@ class StatisticProfile < ApplicationRecord
validate :check_birthday_in_past
def str_gender
return '' if gender.blank?
return '' if gender.nil?
gender ? 'male' : 'female'
end

2
app/views/exports/users_members.xlsx.axlsx
View File

@ -51,7 +51,7 @@ wb.add_worksheet(name: ExcelService.name_safe(t('export_members.members'))) do |
member.email,
member.is_allow_newsletter,
member.last_sign_in_at&.to_date,
member.statistic_profile.gender.nil? ? (member.statistic_profile.gender ? t('export_members.man') : t('export_members.woman')) : '',
!member.statistic_profile.gender.nil? ? (member.statistic_profile.gender ? t('export_members.man') : t('export_members.woman')) : '',
member.statistic_profile.age,
member.invoicing_profile&.address&.address || '',
member.profile.phone,

6
config/locales/app.public.de.yml
View File

@ -199,7 +199,7 @@ de:
by_name: "Von {NAME}"
step_N: "Schritt {INDEX}"
share_on_facebook: "Auf Facebook teilen"
share_on_twitter: "Auf Twitter teilen"
share_on_twitter: "Auf X teilen"
deleted_user: "Gelöschter Nutzer"
posted_on_: "Gepostet am"
CAD_file_to_download: "{COUNT, plural, one {} =0{Keine CAD-Dateien} =1{CAD-Datei zum Download} other{CAD-Dateien zum Download}}"
@ -244,7 +244,7 @@ de:
all_machines: "All machines"
machine_card:
book: "Buchen"
consult: "Beschreibung"
consult: "View"
#details of a machine
machines_show:
book_this_machine: "Diese Maschine buchen"
@ -369,7 +369,7 @@ de:
thanks_for_coming: "Vielen Dank für Ihr Kommen!"
view_event_list: "Kommende Veranstaltungen anzeigen"
share_on_facebook: "Auf Facebook teilen"
share_on_twitter: "Auf Twitter teilen"
share_on_twitter: "Auf X teilen"
last_name_and_first_name: "Last name and first name"
pre_book: "Pre-book"
pre_registration_end_date: "Deadline for pre-registration"

6
config/locales/app.public.en.yml
View File

@ -199,7 +199,7 @@ en:
by_name: "By {NAME}"
step_N: "Step {INDEX}"
share_on_facebook: "Share on Facebook"
share_on_twitter: "Share on Twitter"
share_on_twitter: "Share on X"
deleted_user: "Deleted user"
posted_on_: "Posted on"
CAD_file_to_download: "{COUNT, plural, =0{No CAD files} =1{CAD file to download} other{CAD files to download}}"
@ -244,7 +244,7 @@ en:
all_machines: "All machines"
machine_card:
book: "Book"
consult: "Consult"
consult: "View"
#details of a machine
machines_show:
book_this_machine: "Book this machine"
@ -369,7 +369,7 @@ en:
thanks_for_coming: "Thanks for coming!"
view_event_list: "View events to come"
share_on_facebook: "Share on Facebook"
share_on_twitter: "Share on Twitter"
share_on_twitter: "Share on X"
last_name_and_first_name: "Last name and first name"
pre_book: "Pre-book"
pre_registration_end_date: "Deadline for pre-registration"

8
config/locales/app.public.es-MX.yml
View File

@ -155,7 +155,7 @@ es-MX:
discover_members: "Descubrir miembros"
#next events summary on the home page
fablab_s_next_events: "Próximos eventos"
every_events: "All events"
every_events: "Todos los eventos"
event_card:
on_the_date: "El {DATE}"
from_date_to_date: "Desde {START} hasta {END}"
@ -199,7 +199,7 @@ es-MX:
by_name: "Por {NAME}"
step_N: "Paso {INDEX}"
share_on_facebook: "Compartir en Facebook"
share_on_twitter: "Compartir en Twitter"
share_on_twitter: "Compartir en X"
deleted_user: "Usario eliminado"
posted_on_: "Subido el"
CAD_file_to_download: "{COUNT, plural, one {}=0{No hay archivos CAD} =1{Archivo CAD para descargar} other{Archivos CAD para descargar}}"
@ -244,7 +244,7 @@ es-MX:
all_machines: "Todas las máquinas"
machine_card:
book: "Reservar"
consult: "Consultar"
consult: "View"
#details of a machine
machines_show:
book_this_machine: "Alquilar máquina"
@ -369,7 +369,7 @@ es-MX:
thanks_for_coming: "¡Gracias por venir!"
view_event_list: "Ver próximos eventos"
share_on_facebook: "Compartir en Facebook"
share_on_twitter: "Compartir en Twitter"
share_on_twitter: "Compartir en X"
last_name_and_first_name: "Apellido y nombre"
pre_book: "Preinscribir"
pre_registration_end_date: "Fecha límite para preinscripción"

8
config/locales/app.public.es.yml
View File

@ -155,7 +155,7 @@ es:
discover_members: "Descubrir miembros"
#next events summary on the home page
fablab_s_next_events: "Próximos eventos"
every_events: "All events"
every_events: "Todos los eventos"
event_card:
on_the_date: "El {DATE}"
from_date_to_date: "Desde {START} hasta {END}"
@ -199,7 +199,7 @@ es:
by_name: "Por {NAME}"
step_N: "Paso {INDEX}"
share_on_facebook: "Compartir en Facebook"
share_on_twitter: "Compartir en Twitter"
share_on_twitter: "Compartir en X"
deleted_user: "Usario eliminado"
posted_on_: "Subido el"
CAD_file_to_download: "{COUNT, plural, one {}=0{No hay archivos CAD} =1{Archivo CAD para descargar} other{Archivos CAD para descargar}}"
@ -244,7 +244,7 @@ es:
all_machines: "Todas las máquinas"
machine_card:
book: "Reservar"
consult: "Consultar"
consult: "View"
#details of a machine
machines_show:
book_this_machine: "Alquilar máquina"
@ -369,7 +369,7 @@ es:
thanks_for_coming: "¡Gracias por venir!"
view_event_list: "Ver próximos eventos"
share_on_facebook: "Compartir en Facebook"
share_on_twitter: "Compartir en Twitter"
share_on_twitter: "Compartir en X"
last_name_and_first_name: "Apellido y nombre"
pre_book: "Preinscribir"
pre_registration_end_date: "Fecha límite para preinscripción"

6
config/locales/app.public.fr.yml
View File

@ -199,7 +199,7 @@ fr:
by_name: "Par {NAME}"
step_N: "Étape {INDEX}"
share_on_facebook: "Partager sur Facebook"
share_on_twitter: "Partager sur Twitter"
share_on_twitter: "Partager sur X"
deleted_user: "Utilisateur supprimé"
posted_on_: "Posté le"
CAD_file_to_download: "{COUNT, plural, =0{Aucun fichier CAO} =1{Fichier CAO à télécharger} other{Fichiers CAO à télécharger}}"
@ -244,7 +244,7 @@ fr:
all_machines: "Toutes les machines"
machine_card:
book: "Réserver"
consult: "Consulter"
consult: "View"
#details of a machine
machines_show:
book_this_machine: "Réserver cette machine"
@ -369,7 +369,7 @@ fr:
thanks_for_coming: "Merci d'avoir participé !"
view_event_list: "Voir les événements à venir"
share_on_facebook: "Partager sur Facebook"
share_on_twitter: "Partager sur Twitter"
share_on_twitter: "Partager sur X"
last_name_and_first_name: "Nom et prénom"
pre_book: "Pré-inscrire"
pre_registration_end_date: "Date limite de pré-inscription"

6
config/locales/app.public.it.yml
View File

@ -199,7 +199,7 @@ it:
by_name: "di {NAME}"
step_N: "Fase {INDEX}"
share_on_facebook: "Condividi su Facebook"
share_on_twitter: "Condividi su Twitter"
share_on_twitter: "Condividi su X"
deleted_user: "Utente eliminato"
posted_on_: "Pubblicato su"
CAD_file_to_download: "{COUNT, plural, one {}=0{Nessun file CAD} =1{File CAD da scaricare} other{File CAD da scaricare}}"
@ -244,7 +244,7 @@ it:
all_machines: "Tutte le macchine"
machine_card:
book: "Prenota"
consult: "Vedi"
consult: "View"
#details of a machine
machines_show:
book_this_machine: "Modifica questa macchina"
@ -369,7 +369,7 @@ it:
thanks_for_coming: "Grazie per aver partecipato!"
view_event_list: "Visualizza gli eventi in programma"
share_on_facebook: "Condividi su Facebook"
share_on_twitter: "Condividi su Twitter"
share_on_twitter: "Condividi su X"
last_name_and_first_name: "Last name and first name"
pre_book: "Pre-book"
pre_registration_end_date: "Deadline for pre-registration"

6
config/locales/app.public.no.yml
View File

@ -199,7 +199,7 @@
by_name: "Av {NAME}"
step_N: "Trinn {INDEX}"
share_on_facebook: "Del på Facebook"
share_on_twitter: "Del på Twitter"
share_on_twitter: "Del på X"
deleted_user: "Slettet bruker"
posted_on_: "Postet den"
CAD_file_to_download: "{COUNT, plural, one {} =0{Ingen CAD-filer} =1{CAD-fil for å laste ned} other{CAD-filer for å laste ned}}"
@ -244,7 +244,7 @@
all_machines: "All machines"
machine_card:
book: "Reserver"
consult: "Se på"
consult: "View"
#details of a machine
machines_show:
book_this_machine: "Reserver denne maskinen"
@ -369,7 +369,7 @@
thanks_for_coming: "Takk for besøket!"
view_event_list: "Vis hendelser som kommer"
share_on_facebook: "Del på Facebook"
share_on_twitter: "Del på Twitter"
share_on_twitter: "Del på X"
last_name_and_first_name: "Last name and first name"
pre_book: "Pre-book"
pre_registration_end_date: "Deadline for pre-registration"

6
config/locales/app.public.pt.yml
View File

@ -199,7 +199,7 @@ pt:
by_name: "Por {NAME}"
step_N: "Passo {INDEX}"
share_on_facebook: "Compartilhar no Facebook"
share_on_twitter: "Compartilhar no Twitter"
share_on_twitter: "Compartilhar no X"
deleted_user: "Usuário deletado"
posted_on_: "Criado em"
CAD_file_to_download: "{COUNT, plural, =0{Sem arquivos CAD} =1{Arquivo CAD para download} other{Arquivos CAD para download}}"
@ -244,7 +244,7 @@ pt:
all_machines: "Todas as máquinas"
machine_card:
book: "Reservar"
consult: "Consultar"
consult: "View"
#details of a machine
machines_show:
book_this_machine: "Reservar essa máquina"
@ -369,7 +369,7 @@ pt:
thanks_for_coming: "Obrigado por ter vindo!"
view_event_list: "Visualizar próximos eventos"
share_on_facebook: "Compartilhar no Facebook"
share_on_twitter: "Compartilhar no Twitter"
share_on_twitter: "Compartilhar no X"
last_name_and_first_name: "Último nome e primeiro nome"
pre_book: "Pré-agendamento"
pre_registration_end_date: "Prazo final para o pré-inscrição"

8
config/locales/app.public.sv.yml
View File

@ -155,7 +155,7 @@ sv:
discover_members: "Upptäck medlemmar"
#next events summary on the home page
fablab_s_next_events: "Nästa evenemang"
every_events: "All events"
every_events: "Alla evenemang"
event_card:
on_the_date: "Den {DATE}"
from_date_to_date: "Från {START} till {END}"
@ -199,7 +199,7 @@ sv:
by_name: "Av {NAME}"
step_N: "Steg {INDEX}"
share_on_facebook: "Dela på Facebook"
share_on_twitter: "Dela på Twitter"
share_on_twitter: "Dela på X"
deleted_user: "Ta bort användare"
posted_on_: "Postat den"
CAD_file_to_download: "{COUNT, plural, one {}=0{Inga CAD-filer} =1{CAD-fil att ladda ner} other{CAD-filer att ladda ner}}"
@ -244,7 +244,7 @@ sv:
all_machines: "All utrustning"
machine_card:
book: "Boka"
consult: "Detaljer"
consult: "View"
#details of a machine
machines_show:
book_this_machine: "Boka utrustning"
@ -369,7 +369,7 @@ sv:
thanks_for_coming: "Tack för ditt besök!"
view_event_list: "Visa kommande evenemang"
share_on_facebook: "Dela på Facebook"
share_on_twitter: "Dela på Twitter"
share_on_twitter: "Dela på X"
last_name_and_first_name: "För- och efternamn"
pre_book: "Förboka"
pre_registration_end_date: "Deadline för förbokning"

6
config/locales/app.public.zu.yml
View File

@ -199,7 +199,7 @@ zu:
by_name: "crwdns28098:0{NAME}crwdne28098:0"
step_N: "crwdns28100:0{INDEX}crwdne28100:0"
share_on_facebook: "crwdns28102:0crwdne28102:0"
share_on_twitter: "crwdns28104:0crwdne28104:0"
share_on_twitter: "crwdns38220:0crwdne38220:0"
deleted_user: "crwdns28106:0crwdne28106:0"
posted_on_: "crwdns28108:0crwdne28108:0"
CAD_file_to_download: "crwdns28110:0COUNT={COUNT}crwdne28110:0"
@ -244,7 +244,7 @@ zu:
all_machines: "crwdns36247:0crwdne36247:0"
machine_card:
book: "crwdns28166:0crwdne28166:0"
consult: "crwdns28168:0crwdne28168:0"
consult: "crwdns38224:0crwdne38224:0"
#details of a machine
machines_show:
book_this_machine: "crwdns28170:0crwdne28170:0"
@ -369,7 +369,7 @@ zu:
thanks_for_coming: "crwdns28370:0crwdne28370:0"
view_event_list: "crwdns28372:0crwdne28372:0"
share_on_facebook: "crwdns28374:0crwdne28374:0"
share_on_twitter: "crwdns28376:0crwdne28376:0"
share_on_twitter: "crwdns38222:0crwdne38222:0"
last_name_and_first_name: "crwdns37937:0crwdne37937:0"
pre_book: "crwdns37939:0crwdne37939:0"
pre_registration_end_date: "crwdns37941:0crwdne37941:0"

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "fab-manager",
"version": "6.3.27",
"version": "6.3.28",
"description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
"keywords": [
"fablab",