Skip to content

C
check
Commit f9f531cf by Masaru Abe
Options

SRL対応　デフォルトソート順プロパティ化

parent d4929ff5
Showing with 115 additions and 95 deletions
abvw/common/json/sys/conf.json
{
"apiUrl" : "https://web3.agentec.jp/acms/{0}/abvapi",
"apiLoginUrl" : "https://web3.agentec.jp/acms/nuabvapi",
"apiResourceDlUrl" : "https://web3.agentec.jp/acms/{0}/dl",
"apiUrl" : "https://web5.abook.bz/acms/{0}/abvapi",
"apiLoginUrl" : "https://web5.abook.bz/acms/nuabvapi",
"apiResourceDlUrl" : "https://web5.abook.bz/acms/{0}/dl",
"bookShelfCount" : 15,
"bookListCount" : 15,
"screenlockTimeDefault" : 30,
......@@ -14,5 +14,13 @@
"anonymousLoginId" : "nologin",
"appName" : "ABookWebCL",
"appVersion" : "0.0.1",
"optMusicMode" : 1
"optMusicMode" : 1,
"sortTypeHome" : "3",
"sortOrderHome" : "2",
"sortTypeBookmark" : "1",
"sortOrderBookmark" : "2",
"sortTypeHistory" : "4",
"sortOrderHistory" : "2",
"sortTypeSearch" : "1",
"sortOrderSearch" : "1"
}
abvw/js/bookmark.js
......@@ -13,8 +13,8 @@ BOOKMARK.bookmark_errorContent = [];
BOOKMARK.collection_contents = [];
//ソート条件復帰
BOOKMARK.searchDivision = 1;
BOOKMARK.sortType = 2;
BOOKMARK.searchDivision = "1";
BOOKMARK.sortType = "2";
//スクロール復帰
BOOKMARK.scrollTop = 0;
......@@ -23,6 +23,14 @@ $(document).ready(function () {
if (!AVWEB.avwCheckLogin(COMMON.ScreenIds.Login)) return;
//ソート条件デフォルト設定
if( AVWEB.avwSysSetting().sortTypeBookmark != undefined){
BOOKMARK.searchDivision = AVWEB.avwSysSetting().sortTypeBookmark;
}
if( AVWEB.avwSysSetting().sortOrderBookmark != undefined){
BOOKMARK.sortType = AVWEB.avwSysSetting().sortOrderBookmark;
}
COMMON.LockScreen();
document.title = I18N.i18nText('dspShiori') + ' | ' + I18N.i18nText('sysAppTitle');
......@@ -139,16 +147,16 @@ BOOKMARK.refreshView = function() {
// Default sort is タイトル名, default is asc
ClientData.sortOpt_searchDivision(BOOKMARK.searchDivision);
//前と同じ状態にするので逆転させる
if( BOOKMARK.sortType == 1 ){
BOOKMARK.sortType = 2;
if( BOOKMARK.sortType == "1" ){
BOOKMARK.sortType = "2";
} else {
BOOKMARK.sortType = 1;
BOOKMARK.sortType = "1";
}
ClientData.sortOpt_sortType(BOOKMARK.sortType);
if( BOOKMARK.searchDivision == 1 ){
if( BOOKMARK.searchDivision == "1" ){
BOOKMARK.dspTitleNm_Click();
} else if( BOOKMARK.searchDivision == 2 ){
} else if( BOOKMARK.searchDivision == "2" ){
BOOKMARK.dspTitleNmKn_Click();
} else {
BOOKMARK.dspPubDt_Click();
......@@ -166,20 +174,20 @@ Event groups [start]
BOOKMARK.dspTitleNm_Click = function() {
var isAsc = false;
if (ClientData.sortOpt_searchDivision() == 1) { // Name
if (ClientData.sortOpt_sortType() == 1) { // ASC
if (ClientData.sortOpt_searchDivision() == "1") { // Name
if (ClientData.sortOpt_sortType() == "1") { // ASC
isAsc = false;
BOOKMARK.sortType = 2;
BOOKMARK.sortType = "2";
}
else {
isAsc = true;
BOOKMARK.sortType = 1;
BOOKMARK.sortType = "1";
}
}
else {
BOOKMARK.searchDivision = 1;
BOOKMARK.sortType = 1;
ClientData.sortOpt_searchDivision(1);
BOOKMARK.searchDivision = "1";
BOOKMARK.sortType = "1";
ClientData.sortOpt_searchDivision(BOOKMARK.searchDivision);
isAsc = true;
}
ClientData.sortOpt_sortType(BOOKMARK.sortType);
......@@ -192,20 +200,20 @@ BOOKMARK.dspTitleNm_Click = function() {
};
BOOKMARK.dspTitleNmKn_Click = function() {
var isAsc = false;
if (ClientData.sortOpt_searchDivision() == 2) { // Kana
if (ClientData.sortOpt_sortType() == 1) { // ASC
if (ClientData.sortOpt_searchDivision() == "2") { // Kana
if (ClientData.sortOpt_sortType() == "1") { // ASC
isAsc = false;
BOOKMARK.sortType = 2;
BOOKMARK.sortType = "2";
}
else {
isAsc = true;
BOOKMARK.sortType = 1;
BOOKMARK.sortType = "1";
}
}
else {
BOOKMARK.searchDivision = 2;
BOOKMARK.sortType = 1;
ClientData.sortOpt_searchDivision(2); // Kana
BOOKMARK.searchDivision = "2";
BOOKMARK.sortType = "1";
ClientData.sortOpt_searchDivision(BOOKMARK.searchDivision); // Kana
isAsc = true;
}
ClientData.sortOpt_sortType(BOOKMARK.sortType);
......@@ -218,19 +226,20 @@ BOOKMARK.dspTitleNmKn_Click = function() {
};
BOOKMARK.dspPubDt_Click = function() {
var isAsc = false;
if (ClientData.sortOpt_searchDivision() == 3) { // Publish date
if (ClientData.sortOpt_sortType() == 1) { // ASC
if (ClientData.sortOpt_searchDivision() == "3") { // Publish date
if (ClientData.sortOpt_sortType() == "1") { // ASC
isAsc = false;
BOOKMARK.sortType = 2;
BOOKMARK.sortType = "2";
}
else {
isAsc = true;
BOOKMARK.sortType = 1;
BOOKMARK.sortType = "1";
}
}
else {
BOOKMARK.sortType = 1;
ClientData.sortOpt_searchDivision(3); // Kana
BOOKMARK.searchDivision = "3";
BOOKMARK.sortType = "1";
ClientData.sortOpt_searchDivision(BOOKMARK.searchDivision); // Kana
isAsc = true;
}
ClientData.sortOpt_sortType(BOOKMARK.sortType);
......
abvw/js/contentsearch.js
......@@ -31,6 +31,14 @@ $(document).ready(function(){
return;
}
//ソート条件デフォルト設定
if( AVWEB.avwSysSetting().sortTypeSearch != undefined){
CONTENTSEARCH.DEFAULT_SORT_TYPE = AVWEB.avwSysSetting().sortTypeSearch;
}
if( AVWEB.avwSysSetting().sortOrderSearch != undefined){
CONTENTSEARCH.DEFAULT_SORT_ORDER = AVWEB.avwSysSetting().sortOrderSearch;
}
COMMON.LockScreen();
document.title = I18N.i18nText('txtSearchResult') + ' | ' + I18N.i18nText('sysAppTitle');
......@@ -572,18 +580,14 @@ CONTENTSEARCH.sortByTitleFunction = function(){
if(sortOrder == COMMON.Consts.ConstOrderSetting_Asc)
{
if(sortType == '1'){
sortOrder = COMMON.Consts.ConstOrderSetting_Desc;
sortOrder = COMMON.Consts.ConstOrderSetting_Desc;
}
else{
sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
}
ClientData.searchCond_sortOrder(sortOrder);
}
else
{
sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
ClientData.searchCond_sortOrder(sortOrder);
}
}
ClientData.searchCond_sortOrder(sortOrder);
HEADER.setStatusSort('#control-sort-title',sortOrder == COMMON.Consts.ConstOrderSetting_Asc);
......@@ -622,21 +626,17 @@ CONTENTSEARCH.sortByTitleKanaFunction = function(){
var groupId = ClientData.searchCond_groupId();
if(sortOrder == COMMON.Consts.ConstOrderSetting_Asc)
{
{
if(sortType == '2'){
sortOrder = COMMON.Consts.ConstOrderSetting_Desc;
}
else{
sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
}
ClientData.searchCond_sortOrder(sortOrder);
}
else
{
sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
ClientData.searchCond_sortOrder(sortOrder);
}
}
ClientData.searchCond_sortOrder(sortOrder);
HEADER.setStatusSort('#control-sort-titlekana',sortOrder == COMMON.Consts.ConstOrderSetting_Asc);
if(recordFrom == null || recordFrom == 'undefined'){
......@@ -654,12 +654,10 @@ CONTENTSEARCH.sortByTitleKanaFunction = function(){
sortType = '2';
//refresh gridview
CONTENTSEARCH.refreshGrid();
//refresh add more record
$('#control-nextrecord').css('visibility','hidden');
ClientData.searchCond_sortType(sortType);
CONTENTSEARCH.renderContent(sid, ClientData.searchCond_searchText(), ClientData.searchCond_searchDivision(), sortType, sortOrder, recordFrom, recordTo, genreId, groupId);
};
......@@ -680,16 +678,12 @@ CONTENTSEARCH.sortByReleaseDateFunction = function(){
if(sortType == '3'){
sortOrder = COMMON.Consts.ConstOrderSetting_Desc;
}
else{
sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
}
ClientData.searchCond_sortOrder(sortOrder);
}
else
{
sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
ClientData.searchCond_sortOrder(sortOrder);
}
sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
}
ClientData.searchCond_sortOrder(sortOrder);
HEADER.setStatusSort('#control-sort-releasedate',sortOrder == COMMON.Consts.ConstOrderSetting_Asc);
......@@ -699,9 +693,7 @@ CONTENTSEARCH.sortByReleaseDateFunction = function(){
}
if(recordTo == null || recordTo == 'undefined'){
recordTo = CONTENTSEARCH.returnNumberDispRecordForList();
ClientData.searchCond_recordFrom(recordTo);
}
......
abvw/js/history.js
......@@ -28,9 +28,17 @@ HISTORY.scrollTop = 0;
$(document).ready(function(){
if (!AVWEB.avwCheckLogin(COMMON.ScreenIds.Login)){
return;
}
if (!AVWEB.avwCheckLogin(COMMON.ScreenIds.Login)){
return;
}
//ソート条件デフォルト設定
if( AVWEB.avwSysSetting().sortTypeHistory != undefined){
HISTORY.DEFAULT_SORT_TYPE = AVWEB.avwSysSetting().sortTypeHistory;
}
if( AVWEB.avwSysSetting().sortOrderHistory != undefined){
HISTORY.DEFAULT_SORT_ORDER = AVWEB.avwSysSetting().sortOrderHistory;
}
COMMON.LockScreen();
......
abvw/js/home.js
......@@ -6,8 +6,8 @@ var HOME = {};
//----Constant-----------//
HOME.DEFAULT_DISP_NUMBER_RECORD_FROM = 1;
//HOME.DEFAULT_DISP_NUMBER_RECORD_TO = 15;
HOME.DEFAULT_SORT_TYPE = 3;
HOME.DEFAULT_SORT_ORDER = 2;
HOME.DEFAULT_SORT_TYPE = "3";
HOME.DEFAULT_SORT_ORDER = "2";
HOME.DEFAULT_SEARCH_DIVISION = 0;
HOME.home_realTotalRecord = 0;
......@@ -49,6 +49,14 @@ $(document).ready(function () {
return;
}
//ソート条件デフォルト設定
if( AVWEB.avwSysSetting().sortTypeHome != undefined){
HOME.DEFAULT_SORT_TYPE = AVWEB.avwSysSetting().sortTypeHome;
}
if( AVWEB.avwSysSetting().sortOrderHome != undefined){
HOME.DEFAULT_SORT_ORDER = AVWEB.avwSysSetting().sortOrderHome;
}
document.title = I18N.i18nText('dspHome') + ' | ' + I18N.i18nText('sysAppTitle');
// Set bookmark screen
......@@ -1439,18 +1447,14 @@ HOME.sortByTitleFunction = function() {
var groupId = ClientData.searchCond_groupId();
if (sortOrder == COMMON.Consts.ConstOrderSetting_Asc) {
if (sortType == 1) {
if (sortType == "1") {
sortOrder = COMMON.Consts.ConstOrderSetting_Desc;
}
else {
sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
}
ClientData.searchCond_sortOrder(sortOrder);
}
else {
sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
ClientData.searchCond_sortOrder(sortOrder);
}
ClientData.searchCond_sortOrder(sortOrder);
HEADER.setStatusSort('#control-sort-title',sortOrder == COMMON.Consts.ConstOrderSetting_Asc);
......@@ -1473,7 +1477,7 @@ HOME.sortByTitleFunction = function() {
ClientData.searchCond_recordFrom(recordTo);
}
sortType = 1;
sortType = "1";
ClientData.searchCond_sortType(sortType);
//refresh Gridview
......@@ -1496,18 +1500,14 @@ HOME.sortByTitleKanaFunction = function() {
var groupId = ClientData.searchCond_groupId();
if (sortOrder == COMMON.Consts.ConstOrderSetting_Asc) {
if (sortType == 2) {
if (sortType == "2") {
sortOrder = COMMON.Consts.ConstOrderSetting_Desc;
}
else {
sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
}
ClientData.searchCond_sortOrder(sortOrder);
}
else {
sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
ClientData.searchCond_sortOrder(sortOrder);
}
ClientData.searchCond_sortOrder(sortOrder);
HEADER.setStatusSort('#control-sort-titlekana',sortOrder == COMMON.Consts.ConstOrderSetting_Asc);
......@@ -1530,8 +1530,7 @@ HOME.sortByTitleKanaFunction = function() {
ClientData.searchCond_recordFrom(recordTo);
}
sortType = 2;
//refresh gridview
sortType = "2";
HOME.refreshGrid();
ClientData.searchCond_sortType(sortType);
......@@ -1553,18 +1552,14 @@ HOME.sortByReleaseDateFunction = function() {
var groupId = ClientData.searchCond_groupId();
if (sortOrder == COMMON.Consts.ConstOrderSetting_Asc) {
if (sortType == 3) {
if (sortType == "3") {
sortOrder = COMMON.Consts.ConstOrderSetting_Desc;
}
else {
sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
}
ClientData.searchCond_sortOrder(sortOrder);
}
else {
sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
ClientData.searchCond_sortOrder(sortOrder);
}
ClientData.searchCond_sortOrder(sortOrder);
HEADER.setStatusSort('#control-sort-releasedate',sortOrder == COMMON.Consts.ConstOrderSetting_Asc);
if (recordFrom == null || recordFrom == 'undefined') {
......@@ -1586,7 +1581,7 @@ HOME.sortByReleaseDateFunction = function() {
ClientData.searchCond_recordFrom(recordTo);
}
sortType = 3;
sortType = "3";
//refresh gridview
HOME.refreshGrid();
......@@ -1611,12 +1606,12 @@ HOME.handleLanguage = function() {
var orderSort = ClientData.searchCond_sortOrder();
HEADER.setStatusSort('#'+$('#menu_sort li.current a').attr('id'),orderSort == COMMON.Consts.ConstOrderSetting_Asc);
if (typeSort == 2) {
if (orderSort == COMMON.Consts.ConstOrderSetting_Asc) {
}
else {
}
}
//if (typeSort == "2") {
// if (orderSort == COMMON.Consts.ConstOrderSetting_Asc) {
// }
// else {
// }
//}
}
}
};
......@@ -2145,13 +2140,13 @@ HOME.handleSortDisp = function() {
typeSort = ClientData.searchCond_sortType();
orderSort = ClientData.searchCond_sortOrder();
if (typeSort == 1) {
if (typeSort == "1") {
HEADER.setStatusSort('#control-sort-title',orderSort == COMMON.Consts.ConstOrderSetting_Asc);
}
else if (typeSort == 2) {
else if (typeSort == "2") {
HEADER.setStatusSort('#control-sort-titlekana',orderSort == COMMON.Consts.ConstOrderSetting_Asc);
}
else if (typeSort == 3) {
else if (typeSort == "3") {
HEADER.setStatusSort('#control-sort-releasedate',orderSort == COMMON.Consts.ConstOrderSetting_Asc);
}
}
......
env.sh
......@@ -37,11 +37,19 @@ modify_api()
"anonymousLoginId" : "nologin",
"appName" : "ABookWebCL",
"appVersion" : "0.0.1",
"optMusicMode" : 1
"optMusicMode" : 1,
"sortTypeHome" : "3",
"sortOrderHome" : "2",
"sortTypeBookmark" : "1",
"sortOrderBookmark" : "2",
"sortTypeHistory" : "4",
"sortOrderHistory" : "2",
"sortTypeSearch" : "1",
"sortOrderSearch" : "1"
}
EOF
}
modify_htaccess "$PROTOCOL://$DOMAIN/webvw/"
modify_htaccess "$PROTOCOL://$DOMAIN/acms/webvw/"
modify_api "$PROTOCOL://$DOMAIN/acms"
Markdown is supported
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