Skip to content

Commit

Permalink
Removed unused old classes for managing DAS; replacing attribute with…
Browse files Browse the repository at this point in the history
… code class during measurement ingestion
  • Loading branch information
paulopinheiro1234 committed Jun 25, 2020
1 parent 1930a77 commit b38c778
Show file tree
Hide file tree
Showing 42 changed files with 457 additions and 2,521 deletions.
2 changes: 1 addition & 1 deletion app/org/hadatac/console/controllers/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
public class Version extends Controller {

public Result index() {
String code_version = "1.2.3";
String code_version = "1.2.4";
String base_ontology = ConfigFactory.load().getString("hadatac.community.ont_prefix");
String loaded_base_ontology = NameSpaces.getInstance().getNameByAbbreviation(base_ontology);
String loaded_base_ontology_version = Ontology.getVersionFromAbbreviation(base_ontology);
Expand Down
7 changes: 5 additions & 2 deletions app/org/hadatac/console/controllers/schema/DASManagement.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.List;

import org.hadatac.entity.pojo.DataAcquisitionSchema;
import org.hadatac.entity.pojo.PossibleValue;

import be.objectify.deadbolt.java.actions.Group;
import be.objectify.deadbolt.java.actions.Restrict;
Expand All @@ -16,12 +17,14 @@ public class DASManagement extends Controller {

@Restrict(@Group(AuthApplication.DATA_OWNER_ROLE))
public Result index() {
List<DataAcquisitionSchema> theResults = DataAcquisitionSchema.findAll();
return ok(org.hadatac.console.views.html.schema.DASManagement.render(theResults));
List<DataAcquisitionSchema> sdds = DataAcquisitionSchema.findAll();
return ok(org.hadatac.console.views.html.schema.DASManagement.render(sdds));
}

@Restrict(@Group(AuthApplication.DATA_OWNER_ROLE))
public Result postIndex() {
return index();
}


}
44 changes: 0 additions & 44 deletions app/org/hadatac/console/controllers/schema/EditDAS.java

This file was deleted.

173 changes: 0 additions & 173 deletions app/org/hadatac/console/controllers/schema/EditDASA.java

This file was deleted.

Loading

0 comments on commit b38c778

Please sign in to comment.