Changeset 620


Ignore:
Timestamp:
08/23/14 06:17:53 (5 years ago)
Author:
jls17
Message:
  • archive forms are now listed on the all-schema-list page
  • added filter for form type archive to the list page
  • new file naming class to link to the archive-filter in the breadcrumb area
Location:
branches/work_311
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/work_311/ARInside.cpp

    r618 r620  
    10851085                case AR_SCHEMA_VENDOR: page = PAGE_SCHEMA_VENDOR; break; 
    10861086                case AR_SCHEMA_AUDIT: page = PAGE_SCHEMA_AUDIT; break; 
     1087                case AR_SCHEMA_ARCHIVE: page = PAGE_SCHEMA_ARCHIVE; break; 
    10871088        } 
    10881089 
  • branches/work_311/doc/DocMain.cpp

    r616 r620  
    16491649                << "<input id='typeFilterVendor' type='checkbox' value='5'/><label for='typeFilterVendor'>&nbsp;Vendor</label>" 
    16501650                << "<input id='typeFilterAudit' type='checkbox' value='100'/><label for='typeFilterAudit'>&nbsp;Audit</label>" 
     1651                << "<input id='typeFilterArchive' type='checkbox' value='101'/><label for='typeFilterArchive'>&nbsp;Archive</label>" 
    16511652                << " <button id='typeFilterNone'>Clear All</button>" 
    16521653                << "</span>" 
  • branches/work_311/output/FileNaming.cpp

    r618 r620  
    266266        virtual string GetFileName() const { return FILE_INDEX; } 
    267267        virtual string GetFullFileName() const { return GetPath() + "/" + CWebUtil::DocName(GetFileName()) + "#audit"; } 
     268        virtual string GetPath() const { return DIR_SCHEMA; } 
     269        virtual unsigned int GetRootLevel() const { return 1; } 
     270}; 
     271 
     272class SchemaArchive : public IFileStructure 
     273{ 
     274public: 
     275        SchemaArchive() { } 
     276        virtual string GetFileName() const { return FILE_INDEX; } 
     277        virtual string GetFullFileName() const { return GetPath() + "/" + CWebUtil::DocName(GetFileName()) + "#archive"; } 
    268278        virtual string GetPath() const { return DIR_SCHEMA; } 
    269279        virtual unsigned int GetRootLevel() const { return 1; } 
     
    13681378                case PAGE_SCHEMA_VENDOR: return new SchemaVendor(); 
    13691379                case PAGE_SCHEMA_AUDIT: return new SchemaAudit(); 
     1380                case PAGE_SCHEMA_ARCHIVE: return new SchemaArchive(); 
    13701381 
    13711382                case PAGE_FILTER_ERRORHANDLERS: return new FilterErrorHandlerOverview(); 
     
    24832494                case PAGE_SCHEMA_VENDOR: return new SchemaVendor(); 
    24842495                case PAGE_SCHEMA_AUDIT: return new SchemaAudit(); 
     2496                case PAGE_SCHEMA_ARCHIVE: return new SchemaArchive(); 
    24852497 
    24862498                case PAGE_SCHEMA_FIELDS_CSV: assert(params.obj1 != NULL && params.obj1->GetServerObjectTypeXML() == AR_STRUCT_ITEM_XML_SCHEMA); return new ObjectNameSchemaFieldsCSV(static_cast<const CARSchema*>(params.obj1)); 
  • branches/work_311/output/IFileStructure.h

    r618 r620  
    182182const unsigned int PAGE_SCHEMA_AUDIT = 1017; 
    183183 
     184// === PAGE_SCHEMA_ARCHIVE === 
     185// CPageParams: none 
     186const unsigned int PAGE_SCHEMA_ARCHIVE = 1018; 
     187 
    184188// === PAGE_GROUP_SCHEMA_LIST === 
    185189// CPageParams: data1 = groupObj 
  • branches/work_311/res/arshelper.js

    r616 r620  
    115115        case 5: return "Vendor"; 
    116116        case 100: return "Audit"; 
     117        case 101: return "Archive"; 
    117118        default: return "unknown"; 
    118119    } 
  • branches/work_311/res/schemaList.js

    r616 r620  
    77                        var allTypeOn = true; 
    88                        var allTypeOff = true; 
    9                         for (i = 1; i < 7; i++) { 
    10                                 if (i == 6) { i = 100; /* for special audit type support*/ } 
     9                        for (l = 1; l < 8; l++) { 
     10                                if (l == 6) { i = 100; /* for special audit type support*/ } 
     11                                else if (l == 7) { i = 101; /* for special archive type support*/ } 
     12                                else { i = l; } 
    1113                                this.typeFilter[i] = $('#multiFilter input[value="' + i + '"]').attr('checked'); 
    1214                                if (this.typeFilter[i]) { allTypeOff = false; } 
     
    5557                if (hash === "#vendor") { value = 5; } 
    5658                if (hash === "#audit") { value = 100; } 
     59                if (hash === "#archive") { value = 101; } 
    5760                if (value>0) { 
    5861                        checkBoxes.filter('[value="'+value+'"]').attr("checked","checked"); 
Note: See TracChangeset for help on using the changeset viewer.