Skip to content

Commit

Permalink
Sort video desc id
Browse files Browse the repository at this point in the history
  • Loading branch information
davidmaignan committed Sep 10, 2020
1 parent c4519c9 commit a5c5133
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 33 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Expand Up @@ -71,8 +71,8 @@ jfx {
dependencies {
compile "org.codehaus.griffon:griffon-guice:${griffon.version}"
compile 'org.kordamp.bootstrapfx:bootstrapfx-core:0.2.4'
compile 'org.kordamp.ikonli:ikonli-javafx:1.8.0'
compile 'org.kordamp.ikonli:ikonli-fontawesome-pack:1.8.0'
// compile 'org.kordamp.ikonli:ikonli-javafx:1.8.0'
// compile 'org.kordamp.ikonli:ikonli-fontawesome-pack:1.8.0'
compile 'eu.lestard:advanced-bindings:0.4.0'
compile 'de.jensd:fontawesomefx:8.9'
compile 'com.abercap:mediainfo-java-api:1.0.0.RELEASE'
Expand Down
2 changes: 1 addition & 1 deletion griffon-app/controllers/org/laeq/menu/MenuController.java
Expand Up @@ -133,7 +133,7 @@ public void archive() throws IOException {
UserDAO userDAO = dbService.getUserDAO();
PointDAO pointDAO = dbService.getPointDAO();

Set<Video> videoList = videoDAO.findAll();
List<Video> videoList = videoDAO.findAll();

List<String> srcFiles = new ArrayList<>();

Expand Down
Expand Up @@ -52,7 +52,7 @@ public void mvcGroupInit(@Nonnull Map<String, Object> args) {
pointDAO = dbService.getPointDAO();
categoryDAO = dbService.getCategoryDAO();

Set<Video> videos = videoDAO.findAll();
List<Video> videos = videoDAO.findAll();

videos.forEach(video -> {
video.getPointSet().addAll(pointDAO.findByVideo(video));
Expand Down
24 changes: 1 addition & 23 deletions griffon-app/views/org/laeq/video/ContainerView.java
Expand Up @@ -47,8 +47,6 @@ public class ContainerView extends TranslatedView {
@FXML private Label durationValue;
@FXML private Label totalValue;
@FXML private Group categoryGroup;
@FXML private TextField filterNameField;
@FXML private Label filterLabel;

@FXML private Button exportActionTarget;
@FXML private Button clearActionTarget;
Expand Down Expand Up @@ -78,7 +76,6 @@ public void initUI() {
textFields.put(videoTitleTxt, "org.laeq.video.video_title_text");
textFields.put(durationTxt, "org.laeq.video.duration_text");
textFields.put(totalTxt, "org.laeq.video.total_text");
textFields.put(filterLabel, "org.laeq.video.filter_label");
textFields.put(exportActionTarget, "org.laeq.video.export_btn");
textFields.put(clearActionTarget, "org.laeq.video.clear_btn");
textFields.put(deleteActionTarget, "org.laeq.video.delete_btn");
Expand Down Expand Up @@ -136,16 +133,14 @@ private void init(){
totalColumn.setCellValueFactory(cellData -> cellData.getValue().totalProperty());
editColumn.setCellValueFactory(cellData -> cellData.getValue().isEditable() ? null : new SimpleObjectProperty<>(new Icon(IconSVG.error, Color.DARKORANGE.toString())));

videoTable.setItems(this.model.getFilteredList());
videoTable.setItems(this.model.getVideoList());
videoTable.getSelectionModel().selectedItemProperty().addListener(observable -> {
if(videoTable.getSelectionModel().getSelectedItem() != null){
model.setSelectedVideo(videoTable.getSelectionModel().getSelectedItem());
controller.showDetail();
}
});

filterNameField.textProperty().addListener(filtering());

videoTable.setOnMouseClicked(event -> {
if(event.getClickCount() == 2){
Video video = videoTable.getSelectionModel().getSelectedItem();
Expand All @@ -162,23 +157,6 @@ private void init(){
});
}

private ChangeListener<String> filtering(){
return (observable, oldValue, newValue) -> {
model.getFilteredList().setPredicate(video -> {
if((newValue == null || newValue.isEmpty())){
return true;
}

String filter = newValue.toLowerCase();
if(video.getName().toLowerCase().contains(filter)){
return true;
}

return false;
});
};
}

public void showDetails() {
// Display video information
titleValue.setText(model.getSelectedVideo().getName());
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/laeq/db/DAOInterface.java
@@ -1,9 +1,10 @@
package org.laeq.db;

import java.util.Collection;
import java.util.Set;

public interface DAOInterface<T> {
public void insert(T data) throws DAOException;
public Set<T> findAll();
public Collection<T> findAll();
public void delete(T data) throws DAOException;
}
12 changes: 7 additions & 5 deletions src/main/java/org/laeq/db/VideoDAO.java
Expand Up @@ -6,7 +6,9 @@

import javax.annotation.Nonnull;
import java.sql.*;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

public class VideoDAO extends AbstractDAO implements DAOInterface<Video>{
Expand Down Expand Up @@ -49,7 +51,7 @@ public void insert(Video video) throws DAOException {
}

@Override
public Set<Video> findAll() {
public List<Video> findAll() {
String query = "select V.id as video_id, V.path as path, V.duration as duration, V.user_id AS user_id, \n" +
"V.CREATED_AT AS CREATED_AT, \n" +
"U.first_name AS first_name, " +
Expand All @@ -58,9 +60,9 @@ public Set<Video> findAll() {
"left join USER AS U on V.user_id = U.id \n" +
"left join POINT as P ON P.video_id = V.id \n" +
"left join COLLECTION AS CC on CC.id = V.collection_id \n" +
"GROUP BY P.video_id, V.user_id, V.id, V.created_at, CC.id, U.first_name, U.last_name, CC.ID, CC.name;";
"GROUP BY P.video_id, V.user_id, V.id, V.created_at, CC.id, U.first_name, U.last_name, CC.ID, CC.name ORDER BY V.id DESC;";

Set<Video> result = new HashSet<>();
List<Video> result = new ArrayList<>();

try(Connection connection = getManager().getConnection();
PreparedStatement statement = connection.prepareStatement(query);){
Expand All @@ -77,8 +79,8 @@ public Set<Video> findAll() {



private Set<Video> getResult(ResultSet datas) throws SQLException, DAOException {
Set<Video> result = new HashSet<>();
private List<Video> getResult(ResultSet datas) throws SQLException, DAOException {
List<Video> result = new ArrayList<>();

while(datas.next()){
result.add(generateVideo(datas));
Expand Down

0 comments on commit a5c5133

Please sign in to comment.