Skip to content

december-update #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0ff5cfb
Updated error message for when no media is added to an artist profile
jrcarretas Dec 8, 2023
093e103
Merge pull request #494 from countable-web/fix/error-message-typo
jrcarretas Dec 8, 2023
44ec243
Improvements on the admin for searching and display purposes
jrcarretas Dec 8, 2023
1dd6629
Refactored and improved data migration scripts
jrcarretas Dec 8, 2023
9c5a041
Merge pull request #495 from countable-web/refactor-load-grants-code
jrcarretas Dec 8, 2023
4c467e3
Changed DIALECT to DIALECTS
jrcarretas Dec 8, 2023
ab8909e
Merge pull request #496 from countable-web/update/learn-more-text
jrcarretas Dec 8, 2023
bce8406
Cleaned up tests
jrcarretas Dec 8, 2023
d6d1018
Added guard in case a creator has no email
jrcarretas Dec 8, 2023
ee1f414
Merge pull request #497 from countable-web/update/language-tests
jrcarretas Dec 8, 2023
9cf48a5
Added pylint
jrcarretas Dec 8, 2023
2c71048
Moved pylintrc
jrcarretas Dec 8, 2023
f39f90e
Merge branch 'develop' of github.com:countable-web/maps into update/l…
jrcarretas Dec 8, 2023
d39f03e
Re-do adding pylintrc
jrcarretas Dec 8, 2023
6ef1bb5
Merge pull request #498 from countable-web/update/linting
jrcarretas Dec 8, 2023
17565a4
Resolved list override
jrcarretas Dec 8, 2023
1de17d2
Finished cleaning up placename.py and minor change on media.py
jrcarretas Dec 8, 2023
9e3cb29
Finished cleaning up base.py
jrcarretas Dec 8, 2023
e05aa1e
Finished cleanup for community.py
jrcarretas Dec 8, 2023
ee24d69
Finished cleanup for language.py and added todo comments
jrcarretas Dec 8, 2023
11f5bef
Finished cleanup for media.py
jrcarretas Dec 8, 2023
627abfa
Finished cleanup for others.py
jrcarretas Dec 8, 2023
fb28560
Finished cleanup for __init__.py
jrcarretas Dec 8, 2023
d47b3e6
Fixed function definitions
jrcarretas Dec 8, 2023
5918e18
[update] adjustment for language, and community data
bomiku Dec 11, 2023
d14c6f7
Merge pull request #500 from countable-web/update/december
bomiku Dec 11, 2023
31a069c
Merge pull request #499 from countable-web/clean/language-views
jrcarretas Jan 15, 2024
c7f7bf3
Merge pull request #501 from countable-web/develop
jrcarretas Jan 15, 2024
5b0736c
Merge branch 'master' into master
jrcarretas Jan 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions frontend/components/languages/LanguageSummary.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</li>

<li>
<span class="font-08 color-gray">Learning Speakers:</span>
<span class="font-08 color-gray">Learners:</span>
<span class="font-08 font-weight-bold color-gray">{{
learners || 0
}}</span>
Expand All @@ -33,11 +33,9 @@
<span class="font-08 color-gray">Source:</span>
<span class="font-08 font-weight-bold color-gray"
><a
:href="
`https://fpcc.ca/wp-content/uploads/2020/07/FPCC-LanguageReport-180716-WEB.pdf`
"
:href="`https://fpcc.ca/resource/language-status-report-2022/`"
target="_blank"
>Report on the status of B.C. First Nations Languages 2018</a
>Report on the Status of B.C. First Nations Languages 2022</a
></span
>
</li>
Expand Down
26 changes: 12 additions & 14 deletions frontend/pages/index/content/_fn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<Filters class="mb-3"></Filters>
<section></section>
<section class="pl-3 pr-3">
<div v-if="otherNames">
<!-- <div v-if="otherNames">
<h5 class="other-lang-names-title text-uppercase mt-">
Other Community Names
</h5>
Expand All @@ -56,7 +56,7 @@
:content="name"
class="mr-2"
></LanguageDetailBadge>
</div>
</div> -->
<ul class="list-style-none m-0 p-0 mt-2">
<li>
<span class="font-08 color-gray">Total Population:</span>
Expand All @@ -82,18 +82,18 @@
commDetails.phone || 'N/A'
}}</span>
</li>
<li>
<!-- <li>
<span class="font-08 color-gray">Alternate Phone #:</span>
<span class="font-08 font-weight-bold color-gray">{{
commDetails.alt_phone || 'N/A'
}}</span>
</li>
<li>
</li> -->
<!-- <li>
<span class="font-08 color-gray">Fax #:</span>
<span class="font-08 font-weight-bold color-gray">{{
commDetails.fax || 'N/A'
}}</span>
</li>
</li> -->
</ul>
<div v-if="hasCommunityPopulation" class="mt-3">
<b-table
Expand All @@ -114,9 +114,7 @@
variant="light"
class="font-08"
@click="handleRowClick"
>{{
showCollapse ? 'Hide Charts' : 'Show Charts'
}}</b-button
>{{ showCollapse ? 'Hide Chart' : 'Show Chart' }}</b-button
>
</div>
<!-- <div class="mb-3 mt-3 showHide">
Expand Down Expand Up @@ -309,7 +307,7 @@ import Logo from '@/components/Logo.vue'
import CommunityDetailCard from '@/components/communities/CommunityDetailCard.vue'
import { zoomToPoint } from '@/mixins/map.js'
import Filters from '@/components/Filters.vue'
import LanguageDetailBadge from '@/components/languages/LanguageDetailBadge.vue'
// import LanguageDetailBadge from '@/components/languages/LanguageDetailBadge.vue'
import LanguageCard from '@/components/languages/LanguageCard.vue'
import Badge from '@/components/Badge.vue'
import ErrorScreen from '@/layouts/error.vue'
Expand All @@ -332,7 +330,7 @@ export default {
components: {
// DetailSideBar,
CommunityDetailCard,
LanguageDetailBadge,
// LanguageDetailBadge,
Filters,
LanguageCard,
Badge,
Expand Down Expand Up @@ -643,12 +641,12 @@ export default {

return {
name: lna.language,
labels: ['Fluent', 'Semi Fluent', 'Learners', 'Other'],
labels: ['Fluent', 'Semi Fluent', 'Other'],
datasets: [
{
label: 'Data One',
backgroundColor: ['#2ecc71', '#3498db', '#963B21', '#efefef'],
data: [fluent_speakers, semi_speakers, learners, others],
backgroundColor: ['#2ecc71', '#3498db', '#efefef'],
data: [fluent_speakers, semi_speakers, others + learners],
learnerData: [learners]
}
]
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/index/contribute.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2088,7 +2088,7 @@ export default {

if (this.isMediaRequired) {
this.errors.push(
'Media File: Please add least one media for this artist profile.'
'Media File: Please add at least one media for this artist profile.'
)
this.isLoading = false
return
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/index/languages/_lang/details.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</table>
<div v-if="language.dialect_set.length > 0">
<h5 class="other-lang-names-title text-uppercase mt-4">
Dialect
Dialects
</h5>
<LanguageDetailBadge
v-for="(dialect, index) in language.dialect_set"
Expand Down
Loading