diff --git a/docs/changelog.rst b/docs/changelog.rst index f4dcc9a96..ea3de19b1 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -23,6 +23,7 @@ Improvements: * Exercise image downloader checks only accepted exercises (thanks `@gmmoraes`_) `#363`_ * Use a native data type for the exercises' UUID (thanks `@gmmoraes`_) `#364`_ * Increase speed of testsuite by performing the tests in parallel (thanks `@Mbarak-Mbigo`_) `wger_vulcan/#6`_ +* Update screen when adding an exercise to the workout while using set slider (thanks `@gmmoraes`_) `#374`_ Other improvements and bugfixes: `#336`_, `#359`_,`#386`_ @@ -37,6 +38,9 @@ Other improvements and bugfixes: `#336`_, `#359`_,`#386`_ .. _#336: https://github.com/wger-project/wger/issues/336 .. _#336: https://github.com/wger-project/wger/issues/336 .. _#359: https://github.com/wger-project/wger/issues/359 +.. _#363: https://github.com/wger-project/wger/issues/363 +.. _#364: https://github.com/wger-project/wger/issues/364 +.. _#374: https://github.com/wger-project/wger/issues/374 .. _#381: https://github.com/wger-project/wger/issues/381 .. _#386: https://github.com/wger-project/wger/issues/386 diff --git a/extras/dummy_generator/csv/first_names_usa.README b/extras/dummy_generator/csv/first_names_usa.README new file mode 100644 index 000000000..b4aadbbd5 --- /dev/null +++ b/extras/dummy_generator/csv/first_names_usa.README @@ -0,0 +1 @@ +https://www.ssa.gov/oact/babynames/decades/names2010s.html diff --git a/extras/dummy_generator/csv/first_names_usa.csv b/extras/dummy_generator/csv/first_names_usa.csv new file mode 100644 index 000000000..1027e2310 --- /dev/null +++ b/extras/dummy_generator/csv/first_names_usa.csv @@ -0,0 +1,400 @@ +"Jacob","m" +"Noah","m" +"Mason","m" +"William","m" +"Ethan","m" +"Liam","m" +"Michael","m" +"Alexander","m" +"Jayden","m" +"Daniel","m" +"Aiden","m" +"James","m" +"Elijah","m" +"Matthew","m" +"Benjamin","m" +"Logan","m" +"Anthony","m" +"David","m" +"Joseph","m" +"Joshua","m" +"Jackson","m" +"Andrew","m" +"Christopher","m" +"Gabriel","m" +"Samuel","m" +"Lucas","m" +"John","m" +"Ryan","m" +"Dylan","m" +"Nathan","m" +"Isaac","m" +"Caleb","m" +"Carter","m" +"Christian","m" +"Luke","m" +"Jonathan","m" +"Landon","m" +"Owen","m" +"Jack","m" +"Wyatt","m" +"Henry","m" +"Hunter","m" +"Isaiah","m" +"Brayden","m" +"Gavin","m" +"Nicholas","m" +"Sebastian","m" +"Evan","m" +"Julian","m" +"Tyler","m" +"Aaron","m" +"Jordan","m" +"Eli","m" +"Oliver","m" +"Levi","m" +"Connor","m" +"Jeremiah","m" +"Cameron","m" +"Charles","m" +"Angel","m" +"Thomas","m" +"Adrian","m" +"Robert","m" +"Brandon","m" +"Austin","m" +"Jaxon","m" +"Kevin","m" +"Jose","m" +"Colton","m" +"Zachary","m" +"Josiah","m" +"Dominic","m" +"Chase","m" +"Ayden","m" +"Jason","m" +"Justin","m" +"Ian","m" +"Parker","m" +"Grayson","m" +"Adam","m" +"Blake","m" +"Xavier","m" +"Cooper","m" +"Bentley","m" +"Jace","m" +"Carson","m" +"Nolan","m" +"Nathaniel","m" +"Brody","m" +"Hudson","m" +"Tristan","m" +"Luis","m" +"Juan","m" +"Easton","m" +"Kayden","m" +"Carlos","m" +"Jaxson","m" +"Asher","m" +"Cole","m" +"Jesus","m" +"Ryder","m" +"Vincent","m" +"Alex","m" +"Micah","m" +"Max","m" +"Lincoln","m" +"Bryson","m" +"Damian","m" +"Diego","m" +"Eric","m" +"Hayden","m" +"Elias","m" +"Miles","m" +"Maxwell","m" +"Bryce","m" +"Giovanni","m" +"Leo","m" +"Mateo","m" +"Santiago","m" +"Camden","m" +"Bryan","m" +"Timothy","m" +"Antonio","m" +"Aidan","m" +"Jaden","m" +"Steven","m" +"Sawyer","m" +"Colin","m" +"Leonardo","m" +"Ivan","m" +"Ashton","m" +"Kaleb","m" +"Miguel","m" +"Richard","m" +"Braxton","m" +"Jonah","m" +"Kaden","m" +"Roman","m" +"Brian","m" +"Kyle","m" +"Riley","m" +"Alejandro","m" +"Victor","m" +"Preston","m" +"Joel","m" +"Kaiden","m" +"Wesley","m" +"Patrick","m" +"Jesse","m" +"Marcus","m" +"Declan","m" +"Edward","m" +"Axel","m" +"Sean","m" +"Ezra","m" +"Jake","m" +"Silas","m" +"George","m" +"Jeremy","m" +"Brady","m" +"Caden","m" +"Emmanuel","m" +"Jude","m" +"Grant","m" +"Alan","m" +"Greyson","m" +"Theodore","m" +"Harrison","m" +"Maddox","m" +"Weston","m" +"Malachi","m" +"Oscar","m" +"Cayden","m" +"Brantley","m" +"Bradley","m" +"Mark","m" +"Kenneth","m" +"Jayce","m" +"Nicolas","m" +"Emmett","m" +"Gage","m" +"Abraham","m" +"Ezekiel","m" +"Kai","m" +"Kingston","m" +"Abel","m" +"Jase","m" +"Tucker","m" +"Jameson","m" +"Devin","m" +"Paul","m" +"Derek","m" +"Rylan","m" +"Calvin","m" +"Peyton","m" +"Tanner","m" +"Avery","m" +"Everett","m" +"Bennett","m" +"Ryker","m" +"Sophia","f" +"Emma","f" +"Isabella","f" +"Olivia","f" +"Ava","f" +"Emily","f" +"Abigail","f" +"Mia","f" +"Madison","f" +"Elizabeth","f" +"Chloe","f" +"Ella","f" +"Avery","f" +"Charlotte","f" +"Sofia","f" +"Addison","f" +"Natalie","f" +"Amelia","f" +"Grace","f" +"Evelyn","f" +"Lily","f" +"Aubrey","f" +"Victoria","f" +"Harper","f" +"Lillian","f" +"Hannah","f" +"Zoey","f" +"Samantha","f" +"Brooklyn","f" +"Layla","f" +"Zoe","f" +"Leah","f" +"Anna","f" +"Hailey","f" +"Allison","f" +"Gabriella","f" +"Alexis","f" +"Audrey","f" +"Savannah","f" +"Kaylee","f" +"Sarah","f" +"Riley","f" +"Nevaeh","f" +"Aaliyah","f" +"Camila","f" +"Alyssa","f" +"Claire","f" +"Arianna","f" +"Scarlett","f" +"Alexa","f" +"Taylor","f" +"Ashley","f" +"Brianna","f" +"Peyton","f" +"Bella","f" +"Ariana","f" +"Kylie","f" +"Khloe","f" +"Serenity","f" +"Stella","f" +"Lucy","f" +"Maya","f" +"Sophie","f" +"Madelyn","f" +"Genesis","f" +"Julia","f" +"Aria","f" +"Mackenzie","f" +"Autumn","f" +"Katherine","f" +"Caroline","f" +"Ellie","f" +"Kennedy","f" +"Kayla","f" +"Sadie","f" +"Makayla","f" +"Violet","f" +"Lauren","f" +"Faith","f" +"Gianna","f" +"Penelope","f" +"Skylar","f" +"Eva","f" +"Alexandra","f" +"Melanie","f" +"Aubree","f" +"Nora","f" +"Naomi","f" +"Sydney","f" +"Madeline","f" +"Jasmine","f" +"Morgan","f" +"Kimberly","f" +"Annabelle","f" +"Lydia","f" +"Jocelyn","f" +"Piper","f" +"Bailey","f" +"Paisley","f" +"London","f" +"Trinity","f" +"Ruby","f" +"Andrea","f" +"Molly","f" +"Maria","f" +"Mila","f" +"Eleanor","f" +"Brooke","f" +"Reagan","f" +"Isabelle","f" +"Rylee","f" +"Payton","f" +"Natalia","f" +"Mariah","f" +"Mary","f" +"Paige","f" +"Lilly","f" +"Alice","f" +"Nicole","f" +"Destiny","f" +"Mya","f" +"Jade","f" +"Liliana","f" +"Jordyn","f" +"Vivian","f" +"Kaitlyn","f" +"Brielle","f" +"Kendall","f" +"Clara","f" +"Angelina","f" +"Hadley","f" +"Eliana","f" +"Rachel","f" +"Isabel","f" +"Valentina","f" +"Elena","f" +"Gabrielle","f" +"Vanessa","f" +"Cora","f" +"Hazel","f" +"Katelyn","f" +"Lyla","f" +"Aurora","f" +"Valeria","f" +"Jessica","f" +"Quinn","f" +"Sara","f" +"Amy","f" +"Delilah","f" +"Mckenzie","f" +"Brooklynn","f" +"Reese","f" +"Laila","f" +"Aliyah","f" +"Adriana","f" +"Gracie","f" +"Juliana","f" +"Josephine","f" +"Michelle","f" +"Willow","f" +"Rebecca","f" +"Eden","f" +"Makenzie","f" +"Ariel","f" +"Valerie","f" +"Elise","f" +"Kinsley","f" +"Stephanie","f" +"Kylee","f" +"Jennifer","f" +"Izabella","f" +"Jayla","f" +"Catherine","f" +"Ximena","f" +"Melody","f" +"Margaret","f" +"Ivy","f" +"Daisy","f" +"Alaina","f" +"Lila","f" +"Adalyn","f" +"Summer","f" +"Giselle","f" +"Luna","f" +"Julianna","f" +"Alana","f" +"Londyn","f" +"Hayden","f" +"Ryleigh","f" +"Daniela","f" +"Angela","f" +"Isla","f" +"Alivia","f" +"Adalynn","f" +"Emery","f" +"Melissa","f" +"Kate","f" +"Gabriela","f" +"Keira","f" +"Norah","f" diff --git a/extras/dummy_generator/csv/last_names_usa.README b/extras/dummy_generator/csv/last_names_usa.README new file mode 100644 index 000000000..004e6d615 --- /dev/null +++ b/extras/dummy_generator/csv/last_names_usa.README @@ -0,0 +1 @@ +https://www.census.gov/topics/population/genealogy/data/2010_surnames.html diff --git a/extras/dummy_generator/csv/last_names_usa.csv b/extras/dummy_generator/csv/last_names_usa.csv new file mode 100644 index 000000000..1edf4e77b --- /dev/null +++ b/extras/dummy_generator/csv/last_names_usa.csv @@ -0,0 +1,500 @@ +Smith +Johnson +Williams +Brown +Jones +Garcia +Miller +Davis +Rodriguez +Martinez +Hernandez +Lopez +Gonzalez +Wilson +Anderson +Thomas +Taylor +Moore +Jackson +Martin +Lee +Perez +Thompson +White +Harris +Sanchez +Clark +Ramirez +Lewis +Robinson +Walker +Young +Allen +King +Wright +Scott +Torres +Nguyen +Hill +Flores +Green +Adams +Nelson +Baker +Hall +Rivera +Campbell +Mitchell +Carter +Roberts +Gomez +Phillips +Evans +Turner +Diaz +Parker +Cruz +Edwards +Collins +Reyes +Stewart +Morris +Morales +Murphy +Cook +Rogers +Gutierrez +Ortiz +Morgan +Cooper +Peterson +Bailey +Reed +Kelly +Howard +Ramos +Kim +Cox +Ward +Richardson +Watson +Brooks +Chavez +Wood +James +Bennett +Gray +Mendoza +Ruiz +Hughes +Price +Alvarez +Castillo +Sanders +Patel +Myers +Long +Ross +Foster +Jimenez +Powell +Jenkins +Perry +Russell +Sullivan +Bell +Coleman +Butler +Henderson +Barnes +Gonzales +Fisher +Vasquez +Simmons +Romero +Jordan +Patterson +Alexander +Hamilton +Graham +Reynolds +Griffin +Wallace +Moreno +West +Cole +Hayes +Bryant +Herrera +Gibson +Ellis +Tran +Medina +Aguilar +Stevens +Murray +Ford +Castro +Marshall +Owens +Harrison +Fernandez +Mcdonald +Woods +Washington +Kennedy +Wells +Vargas +Henry +Chen +Freeman +Webb +Tucker +Guzman +Burns +Crawford +Olson +Simpson +Porter +Hunter +Gordon +Mendez +Silva +Shaw +Snyder +Mason +Dixon +Munoz +Hunt +Hicks +Holmes +Palmer +Wagner +Black +Robertson +Boyd +Rose +Stone +Salazar +Fox +Warren +Mills +Meyer +Rice +Schmidt +Garza +Daniels +Ferguson +Nichols +Stephens +Soto +Weaver +Ryan +Gardner +Payne +Grant +Dunn +Kelley +Spencer +Hawkins +Arnold +Pierce +Vazquez +Hansen +Peters +Santos +Hart +Bradley +Knight +Elliott +Cunningham +Duncan +Armstrong +Hudson +Carroll +Lane +Riley +Andrews +Alvarado +Ray +Delgado +Berry +Perkins +Hoffman +Johnston +Matthews +Pena +Richards +Contreras +Willis +Carpenter +Lawrence +Sandoval +Guerrero +George +Chapman +Rios +Estrada +Ortega +Watkins +Greene +Nunez +Wheeler +Valdez +Harper +Burke +Larson +Santiago +Maldonado +Morrison +Franklin +Carlson +Austin +Dominguez +Carr +Lawson +Jacobs +Obrien +Lynch +Singh +Vega +Bishop +Montgomery +Oliver +Jensen +Harvey +Williamson +Gilbert +Dean +Sims +Espinoza +Howell +Li +Wong +Reid +Hanson +Le +Mccoy +Garrett +Burton +Fuller +Wang +Weber +Welch +Rojas +Lucas +Marquez +Fields +Park +Yang +Little +Banks +Padilla +Day +Walsh +Bowman +Schultz +Luna +Fowler +Mejia +Davidson +Acosta +Brewer +May +Holland +Juarez +Newman +Pearson +Curtis +Cortez +Douglas +Schneider +Joseph +Barrett +Navarro +Figueroa +Keller +Avila +Wade +Molina +Stanley +Hopkins +Campos +Barnett +Bates +Chambers +Caldwell +Beck +Lambert +Miranda +Byrd +Craig +Ayala +Lowe +Frazier +Powers +Neal +Leonard +Gregory +Carrillo +Sutton +Fleming +Rhodes +Shelton +Schwartz +Norris +Jennings +Watts +Duran +Walters +Cohen +Mcdaniel +Moran +Parks +Steele +Vaughn +Becker +Holt +Deleon +Barker +Terry +Hale +Leon +Hail +Benson +Haynes +Horton +Miles +Lyons +Pham +Graves +Bush +Thornton +Wolfe +Warner +Cabrera +Mckinney +Mann +Zimmerman +Dawson +Lara +Fletcher +Page +Mccarthy +Love +Robles +Cervantes +Solis +Erickson +Reeves +Chang +Klein +Salinas +Fuentes +Baldwin +Daniel +Simon +Velasquez +Hardy +Higgins +Aguirre +Lin +Cummings +Chandler +Sharp +Barber +Bowen +Ochoa +Dennis +Robbins +Liu +Ramsey +Francis +Griffith +Paul +Blair +Oconnor +Cardenas +Pacheco +Cross +Calderon +Quinn +Moss +Swanson +Chan +Rivas +Khan +Rodgers +Serrano +Fitzgerald +Rosales +Stevenson +Christensen +Manning +Gill +Curry +Mclaughlin +Harmon +Mcgee +Gross +Doyle +Garner +Newton +Burgess +Reese +Walton +Blake +Trujillo +Adkins +Brady +Goodman +Roman +Webster +Goodwin +Fischer +Huang +Potter +Delacruz +Montoya +Todd +Wu +Hines +Mullins +Castaneda +Malone +Cannon +Tate +Mack +Sherman +Hubbard +Hodges +Zhang +Guerra +Wolf +Valencia +Saunders +Franco +Rowe +Gallagher +Farmer +Hammond +Hampton +Townsend +Ingram +Wise +Gallegos +Clarke +Barton +Schroeder +Maxwell +Waters +Logan +Camacho +Strickland +Norman +Person +Colon +Parsons +Frank +Harrington diff --git a/extras/dummy_generator/generator.py b/extras/dummy_generator/generator.py index 10fa17ab9..0f98ff43b 100644 --- a/extras/dummy_generator/generator.py +++ b/extras/dummy_generator/generator.py @@ -80,7 +80,7 @@ action='store', default='germany', help='What country the generated users should belong to. Default: Germany', - choices=['germany', 'ukraine', 'spain']) + choices=['germany', 'ukraine', 'spain', 'usa']) # Workout options workouts_parser = subparsers.add_parser('workouts', help='Create workouts') @@ -452,7 +452,7 @@ # Total meals per plan total_meals = 4 - + for user in userlist: print(' - generating for {0}'.format(user.username)) diff --git a/wger/core/static/js/wger-core.js b/wger/core/static/js/wger-core.js index c42fb9eef..7fe132a85 100644 --- a/wger/core/static/js/wger-core.js +++ b/wger/core/static/js/wger-core.js @@ -520,7 +520,7 @@ function wgerInitEditSet() { initRemoveExerciseFormset(); // Slider to set the number of sets - $('#id_sets').on('change', function () { + $('#id_sets').on('input', function () { updateAllExerciseFormset(); $('#id_sets_value').html($('#id_sets').val()); });