Commit cb2659dd authored by Adrien PARROT's avatar Adrien PARROT
Browse files

Delete bugs (current page nb), add internationalization on SearchPage

parent 33ec88d7
......@@ -50,10 +50,10 @@ sap.ui.jsview("conceptmapper.conceptDetailPage", {
new sap.m.ObjectAttribute({
title : "concept_id",
text : "{conceptDetailModel>/concept_id}",
active : true,
press : function() {
alert("you press me");
}
// active : true,
// press : function() {
// alert("you press me");
// }
}), new sap.m.ObjectAttribute({
title : "concept_code",
text : "{conceptDetailModel>/concept_code}",
......@@ -61,7 +61,7 @@ sap.ui.jsview("conceptmapper.conceptDetailPage", {
}), new sap.m.ObjectAttribute({
title : "concept_class_id",
text : "{conceptDetailModel>/concept_class_id}",
active : true,
// active : true,
}), new sap.m.ObjectAttribute({
title : "vocabulary_id",
text : "{conceptDetailModel>/vocabulary_id}",
......@@ -90,18 +90,18 @@ sap.ui.jsview("conceptmapper.conceptDetailPage", {
title : "{conceptDetailModel>concept_name}",
number : "{conceptDetailModel>standard_concept}",
numberUnit : "{conceptDetailModel>invalid_reason}",
type:"Active",
press: function(){
app.back();
},
// type:"Active",
// press: function(){
// app.back();
// },
attributes : [
new sap.m.ObjectAttribute({
title : "concept_id",
text : "{conceptDetailModel>concept_id}",
active : true,
press : function() {
alert("you press me");
}
// active : true,
// press : function() {
// alert("you press me");
// }
}), new sap.m.ObjectAttribute({
title : "concept_code",
text : "{conceptDetailModel>concept_code}",
......@@ -109,7 +109,7 @@ sap.ui.jsview("conceptmapper.conceptDetailPage", {
}), new sap.m.ObjectAttribute({
title : "concept_class_id",
text : "{conceptDetailModel>concept_class_id}",
active : true,
// active : true,
}), new sap.m.ObjectAttribute({
title : "vocabulary_id",
text : "{conceptDetailModel>vocabulary_id}",
......
......@@ -248,6 +248,11 @@ sap.ui.controller("conceptmapper.searchPage", {
sap.ui.getCore().byId('oButtonNext').setEnabled(true);
getConceptsAjax(oData, oTable_ref, oRowsNumber);
buttonTextShown = 'Current page : ' + oData.page;
//buttonTextFound = 'Total page(s) : ' + aPageFound;
sap.ui.getCore().byId('oButtonCurrentPage').setText(buttonTextShown);
// aData.push(oData);
......@@ -327,6 +332,11 @@ sap.ui.controller("conceptmapper.searchPage", {
oData.page = aPageShown + 2;
getConceptsAjax(oData, oTable_ref, oRowsNumber);
buttonTextShown = 'Current page : ' + oData.page;
//buttonTextFound = 'Total page(s) : ' + aPageFound;
sap.ui.getCore().byId('oButtonCurrentPage').setText(buttonTextShown);
// aData.push(oData);
......
......@@ -25,6 +25,16 @@ sap.ui.jsview("conceptmapper.searchPage", {
// Master Page
var oMiniIB = new sap.m.Input({
id : "oMiniIB",
placeholder : "{i18n>mini_id}",
});
var oMaxiIB = new sap.m.Input({
id : "oMaxiIB",
placeholder : "{i18n>maxi_id}",
});
var oItemTemplateStandard = new sap.ui.core.Item({
key : "{isStandardModel>key}",
......@@ -34,7 +44,7 @@ sap.ui.jsview("conceptmapper.searchPage", {
var oStandardMCB = new sap.m.MultiComboBox({
id : "oStandardMCB",
// width : "400px",
placeholder : "Standard Concepts",
placeholder : "{i18n>standard_label}",
items : {
path : "isStandardModel>/items",
template : oItemTemplateStandard
......@@ -52,7 +62,7 @@ sap.ui.jsview("conceptmapper.searchPage", {
});
var oValidMCB = new sap.m.MultiComboBox({
id : "oValidMCB",
placeholder : "Valid concept",
placeholder : "{i18n>valid_label}",
items : {
path : "isValidModel>/items",
template : oItemTemplateValid
......@@ -71,7 +81,7 @@ sap.ui.jsview("conceptmapper.searchPage", {
});
var oDomainMCB = new sap.m.MultiComboBox({
id : "oDomainMCB",
placeholder : "Choose your domain",
placeholder : "{i18n>domain_label}",
items : {
path : "domain>/items",
template : oItemTemplateDomain
......@@ -89,7 +99,7 @@ sap.ui.jsview("conceptmapper.searchPage", {
});
var oVocMCB = new sap.m.MultiComboBox({
id : "oVocMCB",
placeholder : "Choose your vocabulary",
placeholder : "{i18n>vocabulary_label}",
items : {
path : "vocabulary>/items",
template : oItemTemplateVoc
......@@ -100,20 +110,7 @@ sap.ui.jsview("conceptmapper.searchPage", {
},
});
var oMiniIB = new sap.m.Input({
id : "oMiniIB",
//value: "Mini id", // to suppress
//enabled: false, // to suppress
placeholder : "Mini id",
});
var oMaxiIB = new sap.m.Input({
id : "oMaxiIB",
//value: "Maxi id", // to suppress
//enabled: false, // to suppress
placeholder : "Maxi id",
});
var oItemTemplateLang = new sap.ui.core.Item({
key : "{language>key}",
......@@ -121,7 +118,7 @@ sap.ui.jsview("conceptmapper.searchPage", {
});
var oLangMCB = new sap.m.MultiComboBox({
id : "oLangMCB",
placeholder : "Choose your language",
placeholder : "{i18n>language_label}",
items : {
path : "language>/items",
template : oItemTemplateLang
......@@ -134,14 +131,13 @@ sap.ui.jsview("conceptmapper.searchPage", {
var oMasterPage = new sap.m.Page({
title : "Filters",
title : "{i18n>filters}",
showNavButton : true,
navButtonPress : function(oEvt) {
app.back();
},
content : [ oValidMCB, oStandardMCB, oDomainMCB, oVocMCB,
oMiniIB,
oMaxiIB,
content : [ oMiniIB, oMaxiIB, oDomainMCB, oVocMCB, oStandardMCB, oValidMCB,
oLangMCB, ],
});
......@@ -400,7 +396,7 @@ sap.ui.jsview("conceptmapper.searchPage", {
new sap.m.Button({
id : "oButtonPrev",
text: "Previous",
text: "{i18n>previous}",
type : "Transparent",
enabled: false,
icon : "sap-icon://navigation-left-arrow",
......@@ -413,7 +409,7 @@ sap.ui.jsview("conceptmapper.searchPage", {
new sap.m.Button({
//id: "hideShowFilter",
id : "oButtonNext",
text: "Next",
text: "{i18n>next}",
type : "Transparent",
enabled: false,
iconFirst: false,
......@@ -433,7 +429,7 @@ sap.ui.jsview("conceptmapper.searchPage", {
contentLeft: new sap.m.Button({
id: "hideShowFilter",
text: "Hide-Show Filter",
text: "{i18n>hide_show}",
type : "Reject",
press: function(){
if (oSplitContainer.getMode() === 'ShowHideMode') {
......
......@@ -22,6 +22,14 @@ email=Email
password=Password
#searchPage
app_subhead_search=Research concept page
mini_id=Minimal Id
maxi_id=Maximal Id
standard_label=Standard
valid_label=Validity
domain_label=Choose your domain
vocabulary_label=Choose your vocabulary
language_label=Choose your language
filters=Filters
create_concept=Create
update_concept=Update
delete_concept=Delete
......@@ -32,4 +40,7 @@ concept_class_id=Class
vocabulary_id=Vocabulary
domain_id=Domain
validity=Validity
standard_concept=Standard
\ No newline at end of file
standard_concept=Standard
hide_show=Hide-Show Filters
previous=Previous
next=Next
\ No newline at end of file
......@@ -6,23 +6,31 @@ tile_search=Recherche
tile_map=Mapper
app_subhead_search=Recherche par id
search_placeholder=Recherche (id)
CSV_upload=Telechargement
CSV_upload=T\u00e9l\u00e9chargement
research=Recherche
#userPage
app_subhead_csv=Utilisateurs (un seul utilisateur peut etre selectionne a la fois)
create_user=Creation
app_subhead_csv=Utilisateurs (un seul utilisateur peut \u00eatre s\u00e9lectionn\u00e9 \u00e0 la fois)
create_user=Cr\u00e9ation
update_user=Actualisation
delete_user=Suppression
username=Username
is_admin=Administrateur
firstname=Prenom
firstname=Pr\u00e9nom
lastname=Nom de famille
address=Adresse
email=email
password=Mot de passe
#searchPage
app_subhead_search=Recherche des concepts
create_concept=Creation
mini_id=Id minimal
maxi_id=Id maximal
standard_label=Standard
valid_label=Validit\u00e9
domain_label=Filtrer selon le domaine
vocabulary_label=Fitrer selon le vocabulaire
language_label=Filtrer selon la langue
filters=Filtres
create_concept=Cr\u00e9ation
update_concept=Actualisation
delete_concept=Suppression
concept_id=Id
......@@ -31,5 +39,8 @@ concept_code=Code
concept_class_id=Class
vocabulary_id=Vocabulaire
domain_id=Domain
validity=Validite
standard_concept=Standard
\ No newline at end of file
validity=Validit\u00e9
standard_concept=Standard
hide_show=Cacher-Montrer les filtres
previous=Pr\u00e9c\u00e9dent
next=Suivant
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment