Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 3 deletions src/app/searchcountry/searchcountry.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,20 @@
[translate]="'searchCountry.change-country'"
></div>
<span class="error_message" *ngIf="this.isPcdcCountry === false">
<ion-img
<!-- <ion-img
*ngIf="this.isPcdcCountry === false"
class="error_icon"
src="assets/images/error_country.svg"
></ion-img>
></ion-img> -->

<div
class="search-label-error"
class="search-label-error no-padding"
[translate]="'searchCountry.not-available'"
[translateParams]="{ appName, appNameSuffix }"
></div>
</span>
<div *ngIf="this.isPcdcCountry === false" (click)="openExternalUrl('https://uni-ooi-giga-meter-landing-page-dev.azurewebsites.net/')" class="request-access">Request Access</div>

<span
class="error_message"
*ngIf="this.selectedCountry !=='' && this.selectedCountry !== this.detectedCountry && this.isPcdcCountry !== false"
Expand Down
19 changes: 19 additions & 0 deletions src/app/searchcountry/searchcountry.page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -208,5 +208,24 @@ ion-select:hover {
scrollbar-width: thin;
}



}
.no-padding {
padding: 4px 5px 16px 0px;
}
.request-access {
display: block; /* ensures it appears on next line */
font-size: 12px;
font-weight: 400;
color: #0078D7; /* blue link-like color */
text-decoration: underline;
margin-top: -8px; /* adjust to match spacing below red text */
cursor: pointer;
line-height: 16px;

&:hover {
color: #005ea6; /* darker blue on hover */
text-decoration: none;
}
}
10 changes: 10 additions & 0 deletions src/app/searchcountry/searchcountry.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1239,4 +1239,14 @@ export class SearchcountryPage {
this.isPcdcCountry = true; // temporarily assume it's valid during input
this.filterCountries(event);
}
openExternalUrl(href) {
const url = new URL(href);

// Only add if countryName is defined and not empty
if (this.selectedCountry) {
url.searchParams.set('country', this.selectedCountry);
}

this.settingsService.getShell().shell.openExternal(url.toString());
}
}
2 changes: 1 addition & 1 deletion src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
"country-not-accurate": "It looks like the country you selected may not be accurate to your location.",
"detected-auto": "Your country is automatically detected",
"loading": "Loading",
"not-available": "{{appName}} {{appNameSuffix}} is not available in this country. Please choose another country.",
"not-available": "The country you chose isn't whitelisted for Giga Meter yet. Click below to request access.",
"please-double-check": "Are you sure you want to continue?"
},
"searchSchool": {
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
"country-not-accurate": "Parece que el país que ha seleccionado podría no coincidir con su ubicación. ¿Está seguro de que quiere continuar?",
"detected-auto": "Su país ha sido detectado automáticamente.",
"loading": "Cargando",
"not-available": "la aplicación {{appName}} {{appNameSuffix}} no está disponible en este país. Por favor elija otro país.",
"not-available": "El país que elegiste no está en la lista blanca para Giga Meter todavía. Haz clic abajo para solicitar acceso.",
"please-double-check": "Por favor, verifique su selección."
},
"searchSchool": {
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
"country-not-accurate": "Il semble que le pays que vous avez sélectionné ne corresponde pas à votre emplacement. Êtes-vous sûr de vouloir continuer ?",
"detected-auto": "Votre pays est détecté automatiquement",
"loading": "Chargement",
"not-available": "l'application {{appName}} {{appNameSuffix}} n'est pas disponible dans ce pays. Veuillez choisir un autre pays.",
"not-available": "Le pays que vous avez choisi n'est pas encore sur la liste blanche pour Giga Meter. Cliquez ci-dessous pour demander l'accès.",
"please-double-check": "Veuillez vérifier votre sélection."
},
"searchSchool": {
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
"country-not-accurate": "Parece que o país que você selecionou pode não corresponder à sua localização. ",
"detected-auto": "O seu país foi detectado automaticamente",
"loading": "Carregando",
"not-available": "o aplicativo {{appName}} {{appNameSuffix}} não está disponível neste país. Por favor escolha outro país.",
"not-available": "O país que você escolheu ainda não está na lista de permissões do Giga Meter. Clique abaixo para solicitar acesso.",
"please-double-check": "Tem certeza de que deseja continuar?"
},
"searchSchool": {
Expand Down
4 changes: 2 additions & 2 deletions src/assets/i18n/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
"country": "Страна",
"country-not-accurate": "Похоже, выбранная вами страна не соответствует вашему местоположению",
"please-double-check": "Пожалуйста, еще раз проверьте свой выбор.",
"not-available": "приложение {{appName}} {{appNameSuffix}} недоступно в этой стране. Пожалуйста, выберите другую страну.",
"change-country": "Если страна указана неверно, выберите вашу страну из выпадающего списка."
"not-available": "Выбранная вами страна пока не включена в белый список Giga Meter. Нажмите ниже, чтобы запросить доступ.",
"change-country": "Если выбранная страна указана неверно, выберите вашу страну из выпадающего списка."
},
"searchSchool": {
"search": "ваш школ...",
Expand Down
4 changes: 3 additions & 1 deletion tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./out-tsc/app",
"types": []
"types": [],
"skipLibCheck": true

},
"files": [
"src/main.ts",
Expand Down