Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
neuro-images
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Александр Чаплыгин
neuro-images
Commits
67ee813a
Commit
67ee813a
authored
Jun 02, 2022
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
данные и просмотренных папках на клиенте
parent
c2228127
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
28 deletions
+46
-28
.gitignore
.gitignore
+2
-0
script-main.js
src/public/js/script-main.js
+44
-28
No files found.
.gitignore
View file @
67ee813a
...
@@ -3,5 +3,7 @@ composer.phar
...
@@ -3,5 +3,7 @@ composer.phar
vendor/
vendor/
src/public/fotos/
src/public/fotos/
srt/public/fotos-test/
srt/public/fotos-arch/
src/public/js/script-main.js
View file @
67ee813a
...
@@ -104,10 +104,12 @@ $(document).ready(function(){
...
@@ -104,10 +104,12 @@ $(document).ready(function(){
function
SetCountPairedInFolderItemList
(
folderName
)
function
SetCountPairedInFolderItemList
(
folderName
)
{
{
var
pairsCount
=
currentNumToSelect
[
folderName
]
-
1
;
var
$
(
'.b-list_folders-item[data-folder="'
+
folderName
+
'"] b'
).
text
((
pairsCount
==
0
)
?
''
:
pairsCount
);
pairsCount
=
currentNumToSelect
[
folderName
]
-
1
,
$folderListItem
=
$
(
'.b-list_folders-item[data-folder="'
+
folderName
+
'"]'
);
//var $folderContent = $('.b-folder-content[data-folder="' + folderName + '"]');
$folderListItem
.
attr
(
'data-pairsCount'
,
pairsCount
);
$
(
'b'
,
$folderListItem
).
text
((
pairsCount
==
0
)
?
''
:
pairsCount
);
}
}
function
SetDataGroupContents
(
$currentFolderWrap
)
function
SetDataGroupContents
(
$currentFolderWrap
)
...
@@ -137,7 +139,7 @@ $(document).ready(function(){
...
@@ -137,7 +139,7 @@ $(document).ready(function(){
}
}
console
.
log
(
'AAA common = '
,
common
,
' '
,
sorted
,
' '
,
notSorted
);
//
console.log('AAA common = ', common, ' ', sorted, ' ', notSorted);
if
(
sorted
==
0
)
{
if
(
sorted
==
0
)
{
$sorted
.
removeClass
(
'row'
);
$sorted
.
removeClass
(
'row'
);
}
else
{
}
else
{
...
@@ -222,31 +224,18 @@ $(document).ready(function(){
...
@@ -222,31 +224,18 @@ $(document).ready(function(){
if
(
!
hasSelectedFoto
[
folderName
])
{
if
(
!
hasSelectedFoto
[
folderName
])
{
// выбор первого фото для пары:
// выбор первого фото для пары:
console
.
log
(
'AAA 1-е фото в пару'
);
//
console.log('AAA 1-е фото в пару');
num
=
currentNumToSelect
[
folderName
];
num
=
currentNumToSelect
[
folderName
];
hasSelectedFoto
[
folderName
]
=
true
;
hasSelectedFoto
[
folderName
]
=
true
;
$currentFolderWrap
.
addClass
(
'has-selected'
);
$currentFolderWrap
.
addClass
(
'has-selected'
);
}
else
{
}
else
{
// выбор второго фото для пары (пара сформирована):
// выбор второго фото для пары (пара сформирована):
console
.
log
(
'AAA 2-е фото в пару'
);
//
console.log('AAA 2-е фото в пару');
num
=
currentNumToSelect
[
folderName
];
num
=
currentNumToSelect
[
folderName
];
$pairedFoto
=
$
(
'.b-foto_inner[data-num="'
+
num
+
'"]'
,
$currentFolderWrap
);
$pairedFoto
=
$
(
'.b-foto_inner[data-num="'
+
num
+
'"]'
,
$currentFolderWrap
);
$this
.
addClass
(
'paired'
);
$this
.
addClass
(
'paired'
);
$pairedFoto
.
addClass
(
'paired'
);
$pairedFoto
.
addClass
(
'paired'
);
/*
$this.fadeOut(fadeDuration, function() {
$this.parent('.b-foto').removeClass('order-12').addClass('order-' + num);
$this.fadeIn(fadeDuration);
});
$pairedFoto.fadeOut(fadeDuration, function() {
$pairedFoto.parent('.b-foto').removeClass('order-12').addClass('order-' + num);
$pairedFoto.fadeIn(fadeDuration);
});
$pairedFoto.parent('.b-foto').removeClass('order-12').addClass('order-' + num);
$this.parent('.b-foto').removeClass('order-12').addClass('order-' + num);
*/
var
var
$fotoThis
=
$this
.
parent
(
'.b-foto'
),
$fotoThis
=
$this
.
parent
(
'.b-foto'
),
$fotoPair
=
$pairedFoto
.
parent
(
'.b-foto'
),
$fotoPair
=
$pairedFoto
.
parent
(
'.b-foto'
),
...
@@ -255,8 +244,6 @@ $(document).ready(function(){
...
@@ -255,8 +244,6 @@ $(document).ready(function(){
$fotoPair
.
removeClass
(
'order-'
+
$fotoPair
.
data
(
'ind'
)
).
addClass
(
'order-'
+
num
);
$fotoPair
.
removeClass
(
'order-'
+
$fotoPair
.
data
(
'ind'
)
).
addClass
(
'order-'
+
num
);
$fotoThis
.
removeClass
(
'order-'
+
$fotoThis
.
data
(
'ind'
)
).
addClass
(
'order-'
+
(
num
+
5
));
$fotoThis
.
removeClass
(
'order-'
+
$fotoThis
.
data
(
'ind'
)
).
addClass
(
'order-'
+
(
num
+
5
));
//var foto1 = $pairedFoto.parent('.b-foto').remove();
//var foto2 = $this.parent('.b-foto').remove();
foto1
.
appendTo
(
$
(
'.sorted'
,
$currentFolderWrap
));
foto1
.
appendTo
(
$
(
'.sorted'
,
$currentFolderWrap
));
foto2
.
appendTo
(
$
(
'.sorted'
,
$currentFolderWrap
));
foto2
.
appendTo
(
$
(
'.sorted'
,
$currentFolderWrap
));
SetDataGroupContents
(
$currentFolderWrap
);
SetDataGroupContents
(
$currentFolderWrap
);
...
@@ -297,7 +284,6 @@ $(document).ready(function(){
...
@@ -297,7 +284,6 @@ $(document).ready(function(){
}
}
if
(
$this
.
hasClass
(
'paired'
))
{
if
(
$this
.
hasClass
(
'paired'
))
{
//$pairedFotos.parent('.b-foto').removeClass('order-' + pairedNum).addClass('order-12');
$pairedFotos
.
each
(
function
(){
$pairedFotos
.
each
(
function
(){
var
var
$this
=
$
(
this
).
parent
(
'.b-foto'
),
$this
=
$
(
this
).
parent
(
'.b-foto'
),
...
@@ -362,15 +348,45 @@ $(document).ready(function(){
...
@@ -362,15 +348,45 @@ $(document).ready(function(){
// Клик на "Сохранить" для объявления:
// Клик на "Сохранить" для объявления:
$
(
'.btn.btn-primary.save-folders'
).
on
(
'click'
,
function
(){
$
(
'.btn.btn-primary.save-folders'
).
on
(
'click'
,
function
(){
//if (!confirm('Применить действия над изображениями?')) return false;
// Формируем данные о картинках-парах:
var
data
=
{};
$
(
'.b-list_folders-item'
).
each
(
function
(){
var
$this
=
$
(
this
);
if
(
$this
.
hasClass
(
'viewed'
))
{
var
dataPaired
=
{},
folderName
=
$this
.
data
(
'folder'
),
folderContent
=
$
(
'.b-folder-content[data-folder="'
+
folderName
+
'"]'
),
$pairedFoto
=
$
(
'.b-foto_inner.paired'
,
folderContent
);
if
(
$pairedFoto
.
length
>
0
)
{
$pairedFoto
.
each
(
function
(){
var
$this
=
$
(
this
),
pairNum
=
$this
.
data
(
'num'
);
if
(
!
dataPaired
[
pairNum
])
{
dataPaired
[
pairNum
]
=
[];
}
dataPaired
[
pairNum
].
push
(
$this
.
data
(
'foto'
));
});
}
data
[
folderName
]
=
dataPaired
;
}
});
var
var
$form
=
$
(
'#save-folders-form'
),
$form
=
$
(
'#save-folders-form'
),
action
=
$form
.
attr
(
'action'
),
action
=
$form
.
attr
(
'action'
),
method
=
$form
.
attr
(
'method'
),
method
=
$form
.
attr
(
'method'
);
data
=
{
type
:
213
};
data
.
test
=
123
;
console
.
log
(
'AAA data = '
,
data
);
console
.
log
(
'AAA data = '
,
data
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment